Personnalisation des noms des services, fix #69

:warning: changements importants:

* cloud:
    - `${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud`
    + `${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-cloud}`
* pad:
    - `${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad`
    + `${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-pad}`
* peertube:
    - `${CHATONS_ROOT_DIR:-/srv/chatons}/peertube`
    + `${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-peertube}

Les autres services ne devraient pas être impactés par autre chose que
l’ajout de possibilités.

bag/docker-compose.yml

@@ -19,11 +19,11 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/bag/images:/var/www/wallabag/web/assets/images
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/bag/data:/var/www/wallabag/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-bag}/images:/var/www/wallabag/web/assets/images
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-bag}/data:/var/www/wallabag/data
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: bag.${CHATONS_DOMAIN:-localhost}, www.bag.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-bag}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-bag}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - default
       - web
@@ -37,7 +37,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/bag/db:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-bag}/db:/var/lib/postgresql/data
     networks:
       - default
 

cloud/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/db:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-cloud}/db:/var/lib/postgresql/data
 
   app:
     image: nextcloud:fpm-alpine
@@ -23,16 +23,16 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/app:/var/www/html
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-cloud}/app:/var/www/html
 
   web:
     build: .
     restart: unless-stopped
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/nextcloud/app:/var/www/html:ro
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-cloud}/app:/var/www/html:ro
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: cloud.${CHATONS_DOMAIN:-localhost}, www.cloud.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-cloud}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-cloud}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - web
       - default

dolibarr/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/dolibarr/sql:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-dolibarr}/sql:/var/lib/postgresql/data
 
   app:
     build:
@@ -25,8 +25,8 @@ services:
       - .env
     volumes:
       - data:/var/www/html
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/dolibarr/conf:/var/www/html/conf
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/dolibarr/documents:/var/www/html/documents
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-dolibarr}/conf:/var/www/html/conf
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-dolibarr}/documents:/var/www/html/documents
 
   web:
     build:
@@ -36,11 +36,11 @@ services:
       - app
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: dolibarr.${CHATONS_DOMAIN:-localhost}, www.dolibarr.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-dolibarr}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-dolibarr}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - web
       - default
     volumes:
       - data:/var/www/html:ro
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/dolibarr/conf:/var/www/html/conf:ro
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/dolibarr/documents:/var/www/html/documents:ro
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-dolibarr}/conf:/var/www/html/conf:ro
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-dolibarr}/documents:/var/www/html/documents:ro

gitlab/docker-compose.yml

@@ -8,21 +8,21 @@ services:
   app:
     image: gitlab/gitlab-ce:11.4.5-ce.0
     restart: unless-stopped
-    hostname: 'git.${CHATONS_DOMAIN:-localhost}' # required by gitlab
+    hostname: '${CHATONS_SERVICE:-gitlab}.${CHATONS_DOMAIN:-localhost}' # required by gitlab
     environment:
       - GITLAB_OMNIBUS_CONFIG |
-        external_url 'http://gitlab.${CHATONS_DOMAIN:-localhost}'
-        registry_external_url 'https://gitlab.${CHATONS_DOMAIN:-localhost}:4567'
+        external_url 'http://${CHATONS_SERVICE:-gitlab}.${CHATONS_DOMAIN:-localhost}'
+        registry_external_url 'https://${CHATONS_SERVICE:-gitlab}.${CHATONS_DOMAIN:-localhost}:4567'
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/gitlab/app/data:/var/opt/gitlab
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/gitlab/app/config:/etc/gitlab
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/gitlab/app/logs:/var/log/gitlab
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-gitlab}/app/data:/var/opt/gitlab
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-gitlab}/app/config:/etc/gitlab
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-gitlab}/app/logs:/var/log/gitlab
     ports:
       - "2222:22"
       - "4567:4567"
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: gitlab.${CHATONS_DOMAIN:-localhost}, www.gitlab.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-gitlab}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-gitlab}.${CHATONS_DOMAIN:-localhost}"
       traefik.port: "80"
     networks:
       - web

limesurvey/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/limesurvey/sql:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-limesurvey}/sql:/var/lib/postgresql/data
 
   app:
     build:
@@ -25,7 +25,7 @@ services:
       - .env
     volumes:
       - data:/var/www/html
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/limesurvey/upload:/var/www/html/upload
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-limesurvey}/upload:/var/www/html/upload
 
   web:
     build:
@@ -35,10 +35,10 @@ services:
       - app
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: limesurvey.${CHATONS_DOMAIN:-localhost}, www.limesurvey.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-limesurvey}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-limesurvey}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - web
       - default
     volumes:
       - data:/var/www/html:ro
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/limesurvey/upload:/var/www/html/upload:ro
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-limesurvey}/upload:/var/www/html/upload:ro

links/docker-compose.yml

@@ -9,9 +9,9 @@ services:
     image: shaarli/shaarli:latest
     restart: unless-stopped
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/links/data:/var/www/shaarli/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_DOMAIN:-links}/data:/var/www/shaarli/data
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: links.${CHATONS_DOMAIN:-localhost}, www.links.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_DOMAIN:-links}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_DOMAIN:-links}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - web

matrix/docker-compose.yml

@@ -11,15 +11,15 @@ services:
     env_file:
       - .env
     environment:
-      - SYNAPSE_SERVER_NAME=matrix.${CHATONS_DOMAIN:-localhost}
+      - SYNAPSE_SERVER_NAME=${CHATONS_SERVICE:-matrix}.${CHATONS_DOMAIN:-localhost}
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: matrix.${CHATONS_DOMAIN:-localhost}, www.matrix.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-matrix}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-matrix}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - web
       - default
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/matrix/data:/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-matrix}/data:/data
     ports:
       - 8448:8448
 
@@ -32,13 +32,13 @@ services:
       - POSTGRES_USER=synapse
       - POSTGRES_DB=synapse
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/matrix/postgres:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-matrix}/postgres:/var/lib/postgresql/data
 
   riot:
     build:
       context: .
       args:
-        SYNAPSE_SERVER_NAME: matrix.${CHATONS_DOMAIN:-localhost}
+        SYNAPSE_SERVER_NAME: ${CHATONS_SERVICE:-matrix}.${CHATONS_DOMAIN:-localhost}
         RIOT_VERSION: v0.17.5
     labels:
       traefik.enable: "true"

pad/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/db:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-pad}/db:/var/lib/postgresql/data
 
   app:
     build: .
@@ -20,9 +20,9 @@ services:
       - .env
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: pad.${CHATONS_DOMAIN:-localhost}, www.pad.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-pad}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-pad}.${CHATONS_DOMAIN:-localhost}"
     networks:
       - default
       - web
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/etherpad/app:/opt/etherpad-lite/var
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-pad}/app:/opt/etherpad-lite/var

peertube/docker-compose.yml

@@ -19,8 +19,8 @@ services:
       - web
       - default
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/data:/data
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/config:/config
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-peertube}/data:/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-peertube}/config:/config
 
   db:
     image: postgres:10-alpine
@@ -28,10 +28,10 @@ services:
     env_file:
       - .env
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/postgres:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-peertube}/postgres:/var/lib/postgresql/data
 
   redis:
     image: redis:4-alpine
     restart: unless-stopped
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/peertube/redis:/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-peertube}/redis:/data

sentry/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     image: postgres:11-alpine
     restart: unless-stopped
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/sentry/db:/var/lib/postgresql/data
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-sentry}/db:/var/lib/postgresql/data
   sentry:
     image: sentry
     restart: unless-stopped
@@ -22,13 +22,13 @@ services:
       - default
     labels:
       traefik.enable: "true"
-      traefik.frontend.rule: "Host: sentry.${CHATONS_DOMAIN:-localhost}, www.sentry.${CHATONS_DOMAIN:-localhost}"
+      traefik.frontend.rule: "Host: ${CHATONS_SERVICE:-sentry}.${CHATONS_DOMAIN:-localhost}, www.${CHATONS_SERVICE:-sentry}.${CHATONS_DOMAIN:-localhost}"
     environment:
       - SENTRY_REDIS_HOST=redis
       - SENTRY_POSTGRES_HOST=postgres
-      - SENTRY_SERVER_EMAIL=sentry@${CHATONS_DOMAIN:-localhost}
+      - SENTRY_SERVER_EMAIL=${CHATONS_SERVICE:-sentry}@${CHATONS_DOMAIN:-localhost}
     volumes:
-      - ${CHATONS_ROOT_DIR:-/srv/chatons}/sentry/data:/var/lib/sentry/file
+      - ${CHATONS_ROOT_DIR:-/srv/chatons}/${CHATONS_SERVICE:-sentry}/data:/var/lib/sentry/file
   cron:
     command: "sentry run cron"
     image: sentry