Place env dist in each project

Use tty Update s3 logstore envar
rundeck · Aug 23, 2018 · 95675b5 · 95675b5
1 parent 180f966
commit 95675b5
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 1 deletion.
diff --git a/basic/.env.dist b/basic/.env.dist
@@ -0,0 +1,3 @@
+## Set pro options if applicable
+# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_LICENSE_FILE=
diff --git a/basic/docker-compose.yml b/basic/docker-compose.yml
@@ -3,8 +3,12 @@ version: '3'
 services:
     rundeck:
         image: ${RUNDECK_IMAGE:-rundeck/rundeck:SNAPSHOT}
+        tty: true
+        environment:
+            RUNDECK_PLUGIN_CLUSTER_AUTOTAKEOVER_ENABLED: "true"
         volumes:
           - data:/home/rundeck/server/data
+          - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
 

diff --git a/cloud/docker-compose.yml b/cloud/docker-compose.yml
@@ -8,14 +8,15 @@ services:
                 RUNDECK_IMAGE: ${RUNDECK_IMAGE:-rundeck/rundeck:SNAPSHOT}
         links:
           - mysql
+        tty: true
         environment:
             RUNDECK_GRAILS_URL: http://localhost
             RUNDECK_SERVER_FORWARDED: 'true'
             RUNDECK_DATABASE_DRIVER: com.mysql.jdbc.Driver
             RUNDECK_DATABASE_USERNAME: rundeck
             RUNDECK_DATABASE_PASSWORD: rundeck
             RUNDECK_DATABASE_URL: jdbc:mysql://mysql/rundeck?autoReconnect=true&useSSL=false
-            RUNDECK_PLUGIN_EXECUTIONFILESTORAGE: com.rundeck.rundeckpro.amazon-s3
+            RUNDECK_PLUGIN_EXECUTIONFILESTORAGE_NAME: com.rundeck.rundeckpro.amazon-s3
             RUNDECK_PLUGIN_EXECUTIONFILESTORAGE_S3_BUCKET: ${RUNDECK_PLUGIN_EXECUTIONFILESTORAGE_S3_BUCKET}
             RUNDECK_PLUGIN_EXECUTIONFILESTORAGE_S3_REGION: ${RUNDECK_PLUGIN_EXECUTIONFILESTORAGE_S3_REGION}
             RUNDECK_STORAGE_CONVERTER_1_CONFIG_PASSWORD: ${RUNDECK_STORAGE_PASSWORD}

diff --git a/ldap-combined/.env.dist b/ldap-combined/.env.dist
@@ -0,0 +1,3 @@
+## Set pro options if applicable
+# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_LICENSE_FILE=
diff --git a/ldap-combined/docker-compose.yml b/ldap-combined/docker-compose.yml
@@ -6,6 +6,7 @@ services:
         image: ${RUNDECK_IMAGE:-rundeck/rundeck:SNAPSHOT}
         links:
           - ldap
+        tty: true
         environment:
             RUNDECK_JAAS_MODULES_0: JettyCombinedLdapLoginModule
             RUNDECK_JAAS_LDAP_FLAG: sufficient
@@ -17,6 +18,8 @@ services:
 
             RUNDECK_JAAS_MODULES_1: PropertyFileLoginModule
             RUNDECK_JAAS_FILE_FLAG: sufficient
+        volumes:
+          - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
     ldap:

diff --git a/ldap/.env.dist b/ldap/.env.dist
@@ -0,0 +1,3 @@
+## Set pro options if applicable
+# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_LICENSE_FILE=
diff --git a/ldap/docker-compose.yml b/ldap/docker-compose.yml
@@ -6,13 +6,16 @@ services:
         image: ${RUNDECK_IMAGE:-rundeck/rundeck:SNAPSHOT}
         links:
           - ldap
+        tty: true
         environment:
             RUNDECK_JAAS_MODULES_0: JettyCombinedLdapLoginModule
             RUNDECK_JAAS_LDAP_PROVIDERURL: ldap://ldap:389
             RUNDECK_JAAS_LDAP_BINDDN: cn=admin,dc=rdtest,dc=com
             RUNDECK_JAAS_LDAP_BINDPASSWORD: AdminPass123
             RUNDECK_JAAS_LDAP_USERBASEDN: ou=users,dc=rdtest,dc=com
             RUNDECK_JAAS_LDAP_ROLEBASEDN: ou=roles,dc=rdtest,dc=com
+        volumes:
+          - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
     ldap:

diff --git a/mysql/.env.dist b/mysql/.env.dist
@@ -0,0 +1,3 @@
+## Set pro options if applicable
+# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_LICENSE_FILE=
diff --git a/mysql/docker-compose.yml b/mysql/docker-compose.yml
@@ -10,6 +10,8 @@ services:
             RUNDECK_DATABASE_USERNAME: rundeck
             RUNDECK_DATABASE_PASSWORD: rundeck
             RUNDECK_DATABASE_URL: jdbc:mysql://mysql/rundeck?autoReconnect=true&useSSL=false
+        volumes:
+          - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
     mysql:

diff --git a/oracle/.env.dist b/oracle/.env.dist
@@ -0,0 +1,3 @@
+## Set pro options if applicable
+# RUNDECK_IMAGE=rundeckpro/team:SNAPSHOT
+# RUNDECK_LICENSE_FILE=
diff --git a/oracle/docker-compose.yml b/oracle/docker-compose.yml
@@ -13,6 +13,7 @@ services:
             RUNDECK_DATABASE_URL: jdbc:oracle:thin:@oracle:1521/orclpdb1.localdomain
         volumes:
           - ./lib:/home/rundeck/server/lib
+          - ${RUNDECK_LICENSE_FILE:-/dev/null}:/home/rundeck/etc/rundeckpro-license.key
         ports:
           - 4440:4440
     oracle: