README.md

@@ -1,29 +0,0 @@
-## 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 369332db26c281ab92db2aa187e56cc17533c2d7
+Subproject commit 0b25ed6562dff6576c72e067cd7ae583253f2ec4

bottin-ag

@@ -1 +1 @@
-Subproject commit 34ee2c095535f3cd6775936a28d5f2286904e33b
+Subproject commit 2dec57d097515ab37e2177bb28be1c7963c1bdfa

docker-compose.yaml

@@ -15,12 +15,6 @@ services:
       - 'bottin_db'
     build: './bottin'
     image: 'git.agecem.com/agecem/bottin:latest'
-    environment:
-      BOTTIN_DB_HOST: 'bottin_db'
-      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:
@@ -33,11 +27,6 @@ services:
       - 'bottin_api'
     build: './bottin'
     image: 'git.agecem.com/agecem/bottin:latest'
-    environment:
-      BOTTIN_WEB_API_HOST: 'bottin_api'
-      BOTTIN_WEB_API_KEY: "${BOTTIN_API_KEY}"
-      BOTTIN_WEB_PASSWORD: "${BOTTIN_WEB_PASSWORD}"
-      BOTTIN_WEB_USER: "${BOTTIN_WEB_USER}"
     ports:
       - '2312:2312'
     volumes:
@@ -58,17 +47,8 @@ services:
   bottin_ag_api:
     depends_on:
       - 'bottin_ag_db'
-      - 'bottin_api'
     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_BOTTIN_API_HOST: 'bottin_api'
-      BOTTINAG_DB_DATABASE: "${BOTTINAG_POSTGRES_DATABASE}"
-      BOTTINAG_DB_HOST: 'bottin_ag_db'
-      BOTTINAG_DB_PASSWORD: "${BOTTINAG_POSTGRES_PASSWORD}"
-      BOTTINAG_DB_USER: "${BOTTINAG_POSTGRES_USER}"
     ports:
       - '3182:3182'
     volumes:
@@ -81,11 +61,6 @@ services:
       - 'bottin_ag_api'
     build: './bottin-ag'
     image: 'git.agecem.com/agecem/bottin-ag:latest'
-    environment:
-      BOTTINAG_WEB_API_HOST: 'bottin_ag_api'
-      BOTTINAG_WEB_API_KEY: "${BOTTINAG_API_KEY}"
-      BOTTINAG_WEB_PASSWORD: "${BOTTINAG_WEB_PASSWORD}"
-      BOTTINAG_WEB_USER: "${BOTTINAG_WEB_USER}"
     ports:
       - '3183:3183'
     volumes:

examples/bottin-ag-web.yaml

@@ -1,3 +0,0 @@
-web:
-  api:
-    host: 'bottin_ag_api'