Bump bottin et bottinag avec fonctionalité de config par env

README.md

@@ -0,0 +1,29 @@
+## agecem/ag
+
+Déploiement monolithique de `bottin` et `bottin-ag`
+
+### configuration
+
+Le bloc suivant contient les variables à remplir dans un fichier `.env` situé dans le même répertoire que `docker-compose.yaml`.
+
+*prenez soin de changer les valeurs par défaut!*
+
+``` 
+# fichier: .env
+
+# bottin
+BOTTIN_API_KEY=foobar
+BOTTIN_POSTGRES_DATABASE=foobar
+BOTTIN_POSTGRES_PASSWORD=foobar
+BOTTIN_POSTGRES_USER=foobar
+BOTTIN_WEB_PASSWORD=foobar
+BOTTIN_WEB_USER=foobar
+
+# bottin-ag
+BOTTINAG_API_KEY=foobar
+BOTTINAG_POSTGRES_DATABASE=foobar
+BOTTINAG_POSTGRES_PASSWORD=foobar
+BOTTINAG_POSTGRES_USER=foobar
+BOTTINAG_WEB_PASSWORD=foobar
+BOTTINAG_WEB_USER=foobar
+```

bottin

@@ -1 +1 @@
-Subproject commit 6d2062aecc9354a207633b00d0f15211af498696
+Subproject commit d48bf545d7a26849c88b86588844713f6588554e

bottin-ag

@@ -1 +1 @@
-Subproject commit 4b42f8d215afb895eacd85fc2416835e5a5d4b14
+Subproject commit 5c5ea71622a9dc1dd654de216afdf16b67c2f3ad

docker-compose.yaml

@@ -15,6 +15,11 @@ services:
       - 'bottin_db'
     build: './bottin'
     image: 'git.agecem.com/agecem/bottin:latest'
+    environment:
+      BOTTIN_DB_DATABASE: "${BOTTIN_POSTGRES_DATABASE}"
+      BOTTIN_DB_PASSWORD: "${BOTTIN_POSTGRES_PASSWORD}"
+      BOTTIN_DB_USER: "${BOTTIN_POSTGRES_USER}"
+      BOTTIN_API_KEY: "${BOTTIN_API_KEY}"
     ports:
       - '1312:1312'
     volumes:
@@ -27,6 +32,10 @@ services:
       - 'bottin_api'
     build: './bottin'
     image: 'git.agecem.com/agecem/bottin:latest'
+    environment:
+      BOTTIN_WEB_API_KEY: "${BOTTIN_API_KEY}"
+      BOTTIN_WEB_PASSWORD: "${BOTTIN_WEB_PASSWORD}"
+      BOTTIN_WEB_USER: "${BOTTIN_WEB_USER}"
     ports:
       - '2312:2312'
     volumes:
@@ -49,6 +58,12 @@ services:
       - 'bottin_ag_db'
     build: './bottin-ag'
     image: 'git.agecem.com/agecem/bottin-ag:latest'
+    environment:
+      BOTTINAG_API_KEY: "${BOTTINAG_API_KEY}"
+      BOTTINAG_BOTTIN_API_KEY: "${BOTTIN_API_KEY}"
+      BOTTINAG_DB_DATABASE: "${BOTTINAG_POSTGRES_DATABASE}"
+      BOTTINAG_DB_PASSWORD: "${BOTTINAG_POSTGRES_PASSWORD}"
+      BOTTINAG_DB_USER: "${BOTTINAG_POSTGRES_USER}"
     ports:
       - '3182:3182'
     volumes:
@@ -61,6 +76,10 @@ services:
       - 'bottin_ag_api'
     build: './bottin-ag'
     image: 'git.agecem.com/agecem/bottin-ag:latest'
+    environment:
+      BOTTINAG_WEB_API_KEY: "${BOTTINAG_API_KEY}"
+      BOTTINAG_WEB_PASSWORD: "${BOTTINAG_WEB_PASSWORD}"
+      BOTTINAG_WEB_USER: "${BOTTINAG_WEB_USER}"
     ports:
       - '3183:3183'
     volumes: