ISSUE-4 remove site-specific values from docker-compose files

instantlinux · instantlinux · commit 45d53c8071a6 · 2018-03-19T13:58:16.000-07:00
diff --git a/images/blacklist/docker-compose.yml b/images/blacklist/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.1"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/blacklist:latest
+    image: ${REGISTRY_URI:-instantlinux}/blacklist:${VERSION_BLACKLIST:-latest}
     environment:
       RBL_DOMAIN: ${RBL_DOMAIN:-blacklist.mydomain.com}
       NS_SERVERS: ${NS_SERVERS:-ns.mydomain.com}
diff --git a/images/davite/docker-compose.yml b/images/davite/docker-compose.yml
@@ -2,17 +2,17 @@ version: "3"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/davite:latest
+    image: ${REGISTRY_URI:-instantlinux}/davite:${VERSION_DAVITE:-latest}
     environment:
-      HOSTNAME: davite.ci.net
+      HOSTNAME: davite.${DOMAIN}
       SMTP_PORT: '25'
-      SMTP_SMARTHOST: smtp.ci.net
+      SMTP_SMARTHOST: smtp.${DOMAIN}
       TCP_PORT: ''
     volumes:
     - ${SHARE_PATH}/davite:/var/adm/DaVite_Data
     ports:
     - ${PORT_DAVITE:-8080}:80
-    hostname: davite.ci.net
+    hostname: davite.${DOMAIN}
     deploy:
       placement:
         constraints:
diff --git a/images/dovecot/docker-compose.yml b/images/dovecot/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.1"
 services:
 
   dovecot:
-    image: ${REGISTRY_URI:-instantlinux}/dovecot:latest
+    image: ${REGISTRY_URI:-instantlinux}/dovecot:${VERSION_DOVECOT:-latest}
     volumes:
     - ${ADMIN_PATH:-/opt}/dovecot/etc/:/etc/dovecot/conf.local:ro
     - ${ADMIN_PATH:-/opt}/dovecot/postfix/etc/:/etc/postfix/postfix.d:ro
diff --git a/images/dropbox/docker-compose.yml b/images/dropbox/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
 
   app:
-    image: ${REGISTRY_URI:-instantlinux}/dropbox:latest
+    image: ${REGISTRY_URI:-instantlinux}/dropbox:${VERSION_DROPBOX:-latest}
     hostname: dropbox-docker
     environment:
       UID: ${DROPBOX_UID:-1000}
diff --git a/images/ez-ipupdate/docker-compose.yml b/images/ez-ipupdate/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.1"
 services:
 
   app:
-    image: ${REGISTRY_URI:-instantlinux}/ez-ipupdate:latest
+    image: ${REGISTRY_URI:-instantlinux}/ez-ipupdate:${VERSION_:-latest}
     environment:
       HOST: ${DYNAMIC_HOSTNAME:-www.mydomain.com}
     secrets:
diff --git a/images/git-dump/docker-compose.yml b/images/git-dump/docker-compose.yml
@@ -2,12 +2,12 @@ version: "3.1"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/git-dump:latest
+    image: ${REGISTRY_URI:-instantlinux}/git-dump:${VERSION_GITDUMP:-latest}
     hostname: git-dump
     environment:
-      TZ: US/Pacific
-      REPO_PREFIX: git@git.instantlinux.net:richb/
-      API_TOKEN_SECRET: git.instantlinux.net-api-token
+      TZ: ${TZ:-UTC}
+      REPO_PREFIX: git@git.${MYDOMAIN}:richb/
+      API_TOKEN_SECRET: git.${MYDOMAIN}-api-token
       SSH_PORT: ${PORT_GITLAB_SSH:-22}
     volumes:
     - backup:/var/backup
@@ -19,7 +19,7 @@ services:
     secrets:
     - source: git-dump_sshkey
       mode: 0400
-    - source: git.instantlinux.net-api-token
+    - source: git.${MYDOMAIN}-api-token
       gid: '505'
       mode: 0440
     
@@ -34,5 +34,5 @@ networks:
 secrets:
   git-dump_sshkey:
     external: true
-  git.instantlinux.net-api-token:
+  git.${MYDOMAIN}-api-token:
     external: true
diff --git a/images/git-pull/docker-compose.yml b/images/git-pull/docker-compose.yml
@@ -5,7 +5,7 @@ version: "3.1"
 services:
 
   app:
-    image: ${REGISTRY_URI:-instantlinux}/git-pull:latest
+    image: ${REGISTRY_URI:-instantlinux}/git-pull:${VERSION_GITPULL:-latest}
     environment:
       GIT_COMMIT: master
       GIT_HOST: ${GIT_HOST:-github.com}
diff --git a/images/il-v1/docker-compose.yml b/images/il-v1/docker-compose.yml
@@ -2,12 +2,12 @@ version: "3.1"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/il-v1:latest
+    image: ${REGISTRY_URI:-instantlinux}/il-v1:${VERSION_ILINUX:-latest}
     environment:
-      DB_HOST: db00.ci.net
-      FQDN: homebase.instantlinux.net
+      DB_HOST: ${DB_HOST:-db00}
+      FQDN: homebase.${MYDOMAIN}
       REMOTES: cumbre.ci.net k2.ci.net
-      TZ: US/Pacific
+      TZ: ${TZ:-UTC}
     ports:
     - ${PORT_IL_V1:-8080}:80
     volumes:
diff --git a/images/jenkins-master/docker-compose.yml b/images/jenkins-master/docker-compose.yml
@@ -2,14 +2,14 @@ version: "3.1"
 
 services:
   jenkins-master:
-    image: ${REGISTRY_URI:-instantlinux}/jenkins-master:latest
+    image: ${REGISTRY_URI:-instantlinux}/jenkins-master:${VERSION_JENKINS:-latest}
     environment:
-      ARTIFACTORY_URI: https://repo.ci.net/artifactory
+      ARTIFACTORY_URI: https://repo.${DOMAIN}/artifactory
       ARTIFACTORY_USER: jenkins
-      JENKINS_URL: https://jenkins.ci.net
-      SMTP_ADMIN_ADDRESS: "Jenkins <jenkins@instantlinux.net>"
-      SMTP_SMARTHOST: smtp.ci.net
-      TZ: ${TZ:-US/Pacific}
+      JENKINS_URL: https://jenkins.${DOMAIN}
+      SMTP_ADMIN_ADDRESS: "Jenkins <jenkins@${DOMAIN}>"
+      SMTP_SMARTHOST: smtp.${DOMAIN}
+      TZ: ${TZ:-UTC}
     ports:
     - ${PORT_JENKINS:-8080}:8080
     volumes:
@@ -26,12 +26,12 @@ services:
     - jenkins-admin-password
 
   jenkins-slave:
-    image: ${REGISTRY_URI:-instantlinux}/jenkins-slave:latest
+    image: ${REGISTRY_URI:-instantlinux}/jenkins-slave:${VERSION_JENKINS:-latest}
     environment:
       SWARM_JENKINS_SECRET: jenkins-agent-password
       SWARM_JENKINS_USER: svc_jenkins
       SWARM_MASTER_URL: http://jenkins-master:8080/
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
     volumes:
     - /var/run/docker.sock:/var/run/docker.sock
     deploy:
diff --git a/images/mysqldump/docker-compose.yml b/images/mysqldump/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   app:
     image: ${REGISTRY_URI:-instantlinux}/mysqldump:latest
     environment:
-      TZ: US/Pacific
+      TZ: ${TZ:-UTC}
       SERVERS: ${DB_HOST:-db}
     volumes:
     - backup:/var/backup
diff --git a/images/open-xchange-appsuite/docker-compose.yml b/images/open-xchange-appsuite/docker-compose.yml
@@ -3,10 +3,10 @@ version: "3.1"
 services:
 
   appsuite:
-    image: ${REGISTRY_URI:-instantlinux}/open-xchange-appsuite:latest
+    image: ${REGISTRY_URI:-instantlinux}/open-xchange-appsuite:${VERSION_OX:-latest}
     hostname: oxserver
     environment:
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
     volumes:
     - ${SHARE_PATH:-/opt}/ox-appsuite/data:/ox/store
     - ${ADMIN_PATH:-/opt}/ox-appsuite/etc:/ox/etc:ro
diff --git a/images/postfix-python/docker-compose.yml b/images/postfix-python/docker-compose.yml
@@ -3,14 +3,14 @@ version: "3.1"
 services:
 
   app:
-    image: ${REGISTRY_URI:-instantlinux}/postfix-python:latest
+    image: ${REGISTRY_URI:-instantlinux}/postfix-python:${VERSION_POSTFIX:-latest}
     environment:
       DB_HOST: ${DB_HOST:-db}
       CIDR_MIN_SIZE: ${CIDR_MIN_SIZE:-32}
       HONEYPOT_ADDRS: ${HONEYPOT_ADDRS:-none}
       INBOUND_RELAY: by mx-caprica.?\.easydns\.com
       SPAMC_HOST: ${SPAMC_HOST:-spamd}
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
     volumes:
     - ${ADMIN_PATH:-/opt}/postfix/etc/:/etc/postfix/postfix.d:ro
     - ${SHARE_PATH}/common/pki/certs:/etc/ssl/certs:ro
diff --git a/images/proftpd/docker-compose.yml b/images/proftpd/docker-compose.yml
@@ -2,10 +2,10 @@ version: "3"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/proftpd:latest
+    image: ${REGISTRY_URI:-instantlinux}/proftpd:${VERSION_PROFTPD:-latest}
     environment:
       PASV_ADDRESS: ${PROFTPD_IP}
-      TZ: US/Pacific
+      TZ: ${TZ:-UTC}
     volumes:
     - ftp:/var/lib/ftp:nocopy
     ports:
diff --git a/images/rsyslogd/docker-compose.yml b/images/rsyslogd/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.2"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/rsyslogd:latest
+    image: ${REGISTRY_URI:-instantlinux}/rsyslogd:${VERSION_RSYSLOGD:-latest}
     hostname: rsyslogd.docker
     volumes:
     - ${ADMIN_PATH:-/opt}/rsyslogd/etc/logrotate.d:/etc/logrotate.d:ro
diff --git a/images/spamassassin/docker-compose.yml b/images/spamassassin/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/spamassassin:latest
+    image: ${REGISTRY_URI:-instantlinux}/spamassassin:${VERSION_SPAMASSASSIN:-latest}
     environment:
       EXTRA_OPTIONS: --nouser-config --sql-config
     ports:
diff --git a/images/squirrelmail/docker-compose.yml b/images/squirrelmail/docker-compose.yml
@@ -2,9 +2,9 @@ version: "3.1"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/squirrelmail:latest
+    image: ${REGISTRY_URI:-instantlinux}/squirrelmail:${VERSION_SQUIRRELMAIL:-latest}
     environment:
-      DB_HOST: db00.ci.net
+      DB_HOST: ${DB_HOST:-db}
       DB_NAME_ADDR: rbaddr
       DOMAIN: pioneer.ci.net
       IMAP_SERVER: swarm00.ci.net
diff --git a/images/swarm-sync/docker-compose.yml b/images/swarm-sync/docker-compose.yml
@@ -6,10 +6,10 @@ version: "3.1"
 services:
 
   primary:
-    image: ${REGISTRY_URI:-instantlinux}/swarm-sync:latest
+    image: ${REGISTRY_URI:-instantlinux}/swarm-sync:${VERSION_SWARMSYNC:-latest}
     environment:
       SYNC_INTERVAL: "2"
-      TZ: US/Pacific
+      TZ: ${TZ:-GMT]
     volumes:
     - logs:/var/log/unison
     - syncarchive:/root/.unison
diff --git a/images/udp-nginx-proxy/docker-compose.yml b/images/udp-nginx-proxy/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/udp-nginx-proxy:latest
+    image: ${REGISTRY_URI:-instantlinux}/udp-nginx-proxy:${VERSION_UDPPROXY:-latest}
     environment:
       BACKENDS: ${UDP_BACKENDS:-self}
       PORT_BACKEND: ${PORT_UDPPROXY_BACKEND:-53}
diff --git a/images/weewx/docker-compose-nginx.yml b/images/weewx/docker-compose-nginx.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
 
   app:
-    image: nginx:1.13.5-alpine
+    image: nginx:${VERSION_NGINX:-latest}
     command: >
       sh -c "apk add --update --no-cache openssh rsync &&
       ssh-keygen -A && /usr/sbin/sshd &&
diff --git a/images/wxcam-upload/docker-compose.yml b/images/wxcam-upload/docker-compose.yml
@@ -2,12 +2,12 @@ version: "3.1"
 
 services:
   app:
-    image: ${REGISTRY_URI:-instantlinux}/wxcam-upload:latest
+    image: ${REGISTRY_URI:-instantlinux}/wxcam-upload:${VERSION_WXCAM:-latest}
     environment:
       CAMS: ${WXCAM_CAMS:-cam1}
       PASV_ADDRESS: ${WX_RSYNC_HOST:-swarm}
       UPLOAD_USERNAME: ${WXCAM_UPLOAD_USERNAME:-wx}
-      TZ: US/Pacific
+      TZ: ${TZ:-UTC}
     volumes:
     - ${SHARE_PATH:-/opt}/wx:/home/wx/upload
     ports:
diff --git a/stacks/artifactory.yml b/stacks/artifactory.yml
@@ -2,18 +2,18 @@ version: "3"
 services:
 
   app:
+    image: docker.bintray.io/jfrog/artifactory-oss:${VERSION_ARTIFACTORY:-latest}
     hostname: artifactory
-    ports:
-    - ${PORT_ARTIFACTORY:-18080}:8081
-    volumes:
-    - /var/lib/docker/share/artifactory/data:/var/opt/jfrog/artifactory
-    - /var/lib/docker/share/artifactory/mysql-connector-java-5.1.40.jar:/opt/jfrog/artifactory/tomcat/lib/mysql-connector-java-5.1.40-bin.jar
-    image: docker.bintray.io/jfrog/artifactory-oss:5.2.0
     environment:
-      TZ: ${TZ:-US/Pacific}
-      DB_TYPE: mysql
       DB_HOST: ${DB_HOST:-db00}
       DB_PASSWORD: redacted
+      DB_TYPE: mysql
+      TZ: ${TZ:-UTC}
+    ports:
+    - ${PORT_ARTIFACTORY:-18080}:8081
+    volumes:
+    - ${SHARE_PATH}/artifactory/data:/var/opt/jfrog/artifactory
+    - ${SHARE_PATH}/artifactory/mysql-connector-java-5.1.40.jar:/opt/jfrog/artifactory/tomcat/lib/mysql-connector-java-5.1.40-bin.jar
     deploy:
       placement:
         constraints:
diff --git a/stacks/authelia.yml b/stacks/authelia.yml
@@ -2,7 +2,8 @@ version: '3'
 
 services:
   authelia:
-    image: clems4ever/authelia:v3.2.0
+    hostname: authelia
+    image: clems4ever/authelia:${VERSION_AUTHELIA:-latest}
     volumes:
     - ${ADMIN_PATH:-/opt}/authelia/config.yml:/etc/authelia/config.yml:ro
     - ${SHARE_PATH}/authelia/store:/var/lib/authelia/store
@@ -17,7 +18,7 @@ services:
     image: dinkel/openldap:latest
     environment:
       SLAPD_ORGANISATION: Community Internet
-      SLAPD_DOMAIN: ci.net
+      SLAPD_DOMAIN: ${DOMAIN}
       SLAPD_PASSWORD: password
       SLAPD_ADDITIONAL_MODULES: memberof
       SLAPD_ADDITIONAL_SCHEMAS: openldap
diff --git a/stacks/cloud.yml b/stacks/cloud.yml
@@ -2,16 +2,16 @@ version: "3"
 services:
 
   app:
-    image: nextcloud:13.0.0
-    hostname: cloud.ci.net
+    image: nextcloud:${VERSION_NEXTCLOUD:-latest}
+    hostname: cloud.${DOMAIN}
     environment:
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
     ports:
     - ${PORT_CLOUD:-18280}:80
     volumes:
     - ${SHARE_PATH:-/opt}/cloud/html:/var/www/html
-    - ${PHOTOS_PATH}/richb:/var/www/html/data/richb/files/Photos
-    - ${PHOTOS_PATH}/chitof:/var/www/html/data/chitof/files/Photos
+    - ${PHOTOS_PATH}/${CLOUD_USER1}:/var/www/html/data/${CLOUD_USER1}/files/Photos
+    - ${PHOTOS_PATH}/${CLOUD_USER2}:/var/www/html/data/${CLOUD_USER2}/files/Photos
     deploy:
       placement:
         constraints:
diff --git a/stacks/crashplan.yml b/stacks/crashplan.yml
@@ -7,7 +7,7 @@ services:
     image: gfjardim/crashplan:latest
     hostname: docker-backup
     environment:
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
       VNC_PASSWD: ${VNC_PASSWD:-crashplan}
     volumes:
     - config:/config
diff --git a/stacks/db00.yml b/stacks/db00.yml
@@ -3,7 +3,7 @@ version: "3.2"
 services:
   peer:
     hostname: "{{.Service.Name}}-{{.Task.Slot}}"
-    image: ${REGISTRY_URI:-instantlinux}/mariadb-galera:latest
+    image: ${REGISTRY_URI:-instantlinux}/mariadb-galera:${VERSION_MARIADB:-latest}
     environment:
       CLUSTER_NAME: ${CLUSTER_NAME:-cluster01}
       DISCOVERY_SERVICE: ${ETCD_HOST:-etcd}:2379
diff --git a/stacks/duplicati.yml b/stacks/duplicati.yml
@@ -2,10 +2,10 @@ version: "3"
 services:
 
   app:
-    image: ${REGISTRY_URI:-instantlinux}/duplicati:latest
+    image: ${REGISTRY_URI:-instantlinux}/duplicati:${VERSION_DUPLICATI:-latest}
     environment:
       PUID: 0
-      TZ: ${TZ:-US/Pacific}
+      TZ: ${TZ:-UTC}
     ports:
     - ${PORT_DUPLICATI:-8200}:8200
     volumes:
diff --git a/stacks/gitlab.yml b/stacks/gitlab.yml
@@ -2,15 +2,15 @@ version: "3"
 services:
 
   app:
-    image: gitlab/gitlab-ce:8.16.4-ce.0
+    image: gitlab/gitlab-ce:${VERSION_GITLAB:-latest}
     hostname: git.instantlinux.net
     command: >
       bash -c "mkdir -p /var/backups/gitlab &&
       rm -fr /var/opt/gitlab/backups &&
       ln -fnsT /var/backups/gitlab /var/opt/gitlab/backups &&
       exec /assets/wrapper"
     environment:
-      TZ: US/Pacific
+      TZ: ${TZ:-UTC}
     ports:
     - ${PORT_GITLAB_HTTP:-18080}:80
     - ${PORT_GITLAB_SSH:-8999}:22
diff --git a/stacks/guacamole.yml b/stacks/guacamole.yml
diff --git a/stacks/jira.yml b/stacks/jira.yml
diff --git a/stacks/logspout.yml b/stacks/logspout.yml
diff --git a/stacks/nexus.yml b/stacks/nexus.yml
diff --git a/stacks/registry.yml b/stacks/registry.yml
diff --git a/stacks/splunk.yml b/stacks/splunk.yml
diff --git a/stacks/swarm-sync-2.yml b/stacks/swarm-sync-2.yml
diff --git a/stacks/wordpress-ci.yml b/stacks/wordpress-ci.yml
diff --git a/stacks/wordpress-il.yml b/stacks/wordpress-il.yml
diff --git a/stacks/www00.yml b/stacks/www00.yml
diff --git a/stacks/wwwext.yml b/stacks/wwwext.yml
