From dfb680fb502f7f55795448eac937e0d10a7d7cfd Mon Sep 17 00:00:00 2001 From: mrdubr Date: Mon, 13 May 2024 12:56:57 -0400 Subject: [PATCH 1/4] 5.3.0-rc1 testing --- mysql/docker-compose.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml index d9e7dd8..79b9c3e 100644 --- a/mysql/docker-compose.yml +++ b/mysql/docker-compose.yml @@ -2,21 +2,26 @@ version: '3' services: rundeck: - image: rundeck/rundeck:SNAPSHOT + image: rundeckpro/enterprise:5.3.0-rc1-20240508 links: - mysql environment: + TZ: America/Los_Angeles RUNDECK_DATABASE_DRIVER: org.mariadb.jdbc.Driver RUNDECK_DATABASE_USERNAME: rundeck RUNDECK_DATABASE_PASSWORD: rundeck RUNDECK_DATABASE_URL: jdbc:mysql://mysql/rundeck?autoReconnect=true&useSSL=false RUNDECK_GRAILS_URL: localhost:4440 + RUNDECK_SERVER_ADDRESS: 0.0.0.0 volumes: - - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key + # Change the path to the license key file + - /Users/agrachtchouk/rundeck_dev/pagerduty.com-SUBSCRIBER-ENTERPRISE-agrachtchouk.key:/home/rundeck/etc/rundeckpro-license.key ports: - 4440:4440 mysql: - image: mysql:5.7 + image: mysql:5.7.29 + # Required for arm64 (Apple M1 chip) + platform: linux/x86_64 expose: - 3306 environment: From d6cad5a32851702a9d53e6b83ce63d518e5d241a Mon Sep 17 00:00:00 2001 From: mrdubr Date: Mon, 13 May 2024 13:41:41 -0400 Subject: [PATCH 2/4] use env varables --- mysql/.env.dist | 2 +- mysql/docker-compose.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql/.env.dist b/mysql/.env.dist index eaf8b32..c67d8a3 100644 --- a/mysql/.env.dist +++ b/mysql/.env.dist @@ -1,3 +1,3 @@ ## Set pro options if applicable -# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT +# RUNDECK_IMAGE=rundeckpro/enterprise:5.3.0-rc1-20240508 # RUNDECK_LICENSE_FILE= \ No newline at end of file diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml index 79b9c3e..d4a503b 100644 --- a/mysql/docker-compose.yml +++ b/mysql/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: rundeck: - image: rundeckpro/enterprise:5.3.0-rc1-20240508 + image: ${RUNDECK_IMAGE} links: - mysql environment: @@ -15,7 +15,7 @@ services: RUNDECK_SERVER_ADDRESS: 0.0.0.0 volumes: # Change the path to the license key file - - /Users/agrachtchouk/rundeck_dev/pagerduty.com-SUBSCRIBER-ENTERPRISE-agrachtchouk.key:/home/rundeck/etc/rundeckpro-license.key + - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key ports: - 4440:4440 mysql: From 787878588285c1cb6ddcedcf45a42e2f1db8b6c4 Mon Sep 17 00:00:00 2001 From: mrdubr Date: Mon, 13 May 2024 13:42:44 -0400 Subject: [PATCH 3/4] remove comment --- mysql/docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml index d4a503b..bd2f76e 100644 --- a/mysql/docker-compose.yml +++ b/mysql/docker-compose.yml @@ -14,7 +14,6 @@ services: RUNDECK_GRAILS_URL: localhost:4440 RUNDECK_SERVER_ADDRESS: 0.0.0.0 volumes: - # Change the path to the license key file - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key ports: - 4440:4440 From 80f030124061d59b6c7d8bf2ce65ab5f9884b8bc Mon Sep 17 00:00:00 2001 From: mrdubr Date: Mon, 13 May 2024 14:20:07 -0400 Subject: [PATCH 4/4] fixed RUNDECK_GRAILS_URL --- mysql/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml index bd2f76e..7148054 100644 --- a/mysql/docker-compose.yml +++ b/mysql/docker-compose.yml @@ -11,8 +11,7 @@ services: RUNDECK_DATABASE_USERNAME: rundeck RUNDECK_DATABASE_PASSWORD: rundeck RUNDECK_DATABASE_URL: jdbc:mysql://mysql/rundeck?autoReconnect=true&useSSL=false - RUNDECK_GRAILS_URL: localhost:4440 - RUNDECK_SERVER_ADDRESS: 0.0.0.0 + RUNDECK_GRAILS_URL: http://localhost:4440 volumes: - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key ports: