From b0485962de4f3cb0835705b0adab49d2c9eab3e2 Mon Sep 17 00:00:00 2001
From: Jeltz <tom.barthe+aurore@ens-paris-saclay.fr>
Date: Sun, 21 Mar 2021 17:52:41 +0100
Subject: [PATCH] Declare environment variables using YAML syntax

---
 docker-compose.yml | 66 ++++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index fe192c2..68f01a4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 version: "3"
 
 services:
@@ -12,18 +13,18 @@ services:
     build: hedgedoc
     restart: always
     environment:
-      - "CMD_DB_URL=${CODIMD_DB_URL}"
-      - "CMD_LDAP_BINDCREDENTIALS=${CODIMD_LDAP_BINDCREDENTIALS}"
-    ports:
-      - "8081:3000"
+      CMD_DB_URL: "${CODIMD_DB_URL}"
+      CMD_LDAP_BINDCREDENTIALS: "${CODIMD_LDAP_BINDCREDENTIALS}"
     volumes:
       - ./codimd_uploads_data:/hedgedoc/public/uploads
+    ports:
+      - 8081:3000
 
   grafana:
     build: grafana
     restart: always
     environment:
-      - "ENV_PASSWORD=${GRAFANA_LDAP_BIND_PASSWD}"
+      ENV_PASSWORD: "${GRAFANA_LDAP_BIND_PASSWD}"
     volumes:
       - ./grafana_data:/var/lib/grafana
     ports:
@@ -41,7 +42,7 @@ services:
     build: etherpad
     restart: always
     environment:
-      - "POSTGRES_PASSWORD=${ETHERPAD_POSTGRES_PASSWD}"
+      POSTGRES_PASSWORD: "${ETHERPAD_POSTGRES_PASSWD}"
     ports:
       - 8084:9001
 
@@ -53,49 +54,49 @@ services:
       DJANGO_SECRET_KEY: "${DJANGO_CAS_SECRET_KEY}"
       DJANGO_CAS_LDAP_PASSWORD: "${DJANGO_CAS_LDAP_PASSWORD}"
     ports:
-      - "8085:8000"
+      - 8085:8000
 
   statping:
     image: statping/statping:v0.90.74
     restart: always
-    ports:
-      - 8086:8080
-    volumes:
-      - ./statping_data:/app
     environment:
       DB_CONN: sqlite
+    volumes:
+      - ./statping_data:/app
+    ports:
+      - 8086:8080
 
   docker_exporter:
     image: prometheusnet/docker_exporter
     restart: always
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock:ro
     ports:
       - "8087:9417"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
 
   kanboard:
     image: kanboard/kanboard:v1.2.18
-    ports:
-      - 8088:80
+    environment:
+      LDAP_AUTH: "true"
+      LDAP_SERVER: ldap://10.128.0.149
+      LDAP_BIND_TYPE: proxy
+      LDAP_USERNAME: "cn=kanboard,ou=service-users,dc=auro,dc=re"
+      LDAP_PASSWORD: "${KANBOARD_LDAP_PASSWORD}"
+      LDAP_USER_BASE_DN: "cn=Utilisateurs,dc=auro,dc=re"
+      LDAP_USER_FILTER: "(&(objectClass=posixAccount)(uid=%s))"
+      LDAP_GROUP_PROVIDER: "false"
+      DB_DRIVER: postgres
+      DB_HOSTNAME: 10.128.0.96
+      DB_NAME: kanboard
+      DB_USERNAME: kanboard
+      DB_PASSWORD: "${KANBOARD_DB_PASSWORD}"
+      ENABLE_XFRAME: "false"
+      DEBUG: "false"
     volumes:
       - ./kanboard_data:/var/www/app/data
       - ./kanboard_plugins:/var/www/app/plugins
-    environment:
-      - "LDAP_AUTH=true"
-      - "LDAP_SERVER=ldap://10.128.0.149"
-      - "LDAP_BIND_TYPE=proxy"
-      - "LDAP_USERNAME=cn=kanboard,ou=service-users,dc=auro,dc=re"
-      - "LDAP_PASSWORD=${KANBOARD_LDAP_PASSWORD}"
-      - "LDAP_USER_BASE_DN=cn=Utilisateurs,dc=auro,dc=re"
-      - "LDAP_USER_FILTER=(&(objectClass=posixAccount)(uid=%s))"
-      - "LDAP_GROUP_PROVIDER=false"
-      - "DB_DRIVER=postgres"
-      - "DB_HOSTNAME=10.128.0.96"
-      - "DB_USERNAME=kanboard"
-      - "DB_PASSWORD=${KANBOARD_DB_PASSWORD}"
-      - "DB_NAME=kanboard" 
-      - "ENABLE_XFRAME=false"
-      - "DEBUG=false"
+    ports:
+      - 8088:80
 
   kanbot:
     build: kanbot
@@ -122,4 +123,5 @@ services:
     build: prometheus-alertmanager-discord
     restart: always
     environment:
-      - "DISCORD_WEBHOOK=${PROMETHEUS_DISCORD_WEBHOOK}"
+      DISCORD_WEBHOOK: "${PROMETHEUS_DISCORD_WEBHOOK}"
+...