From cd79d1701f3d269e455e24cd06e330dd5681770b Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Sun, 17 Sep 2023 01:33:38 -0400 Subject: [PATCH 01/17] Update bottin-ag submodule --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index 2dec57d..c6f3a52 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 2dec57d097515ab37e2177bb28be1c7963c1bdfa +Subproject commit c6f3a52f917bad68fde3dc0fa7ce0b312a372908 From 932783b907d263fde50c23b1ce906c755ef51388 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Sun, 17 Sep 2023 16:33:57 -0400 Subject: [PATCH 02/17] Add examples/bottin-ag-web.yaml --- examples/bottin-ag-web.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 examples/bottin-ag-web.yaml diff --git a/examples/bottin-ag-web.yaml b/examples/bottin-ag-web.yaml new file mode 100644 index 0000000..e1e3e95 --- /dev/null +++ b/examples/bottin-ag-web.yaml @@ -0,0 +1,3 @@ +web: + api: + host: 'bottin_ag_api' From 4707b9d65a841952ed3ca50263ff979a747fcefe Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Sun, 17 Sep 2023 16:34:16 -0400 Subject: [PATCH 03/17] Update bottin-ag --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index c6f3a52..380e749 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit c6f3a52f917bad68fde3dc0fa7ce0b312a372908 +Subproject commit 380e749a2aca003efe252facc07b55e63271a07c From 4aac59273b888572ac90557742b00a84a5717c1a Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Sun, 17 Sep 2023 16:41:21 -0400 Subject: [PATCH 04/17] Update bottin-ag -> v0.16.1 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index 380e749..1b046cc 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 380e749a2aca003efe252facc07b55e63271a07c +Subproject commit 1b046cc5e0efa5a0fb5672bfc7167ad57b00ae00 From 0d20be3a97f31febda69ce300b68d4db5a3760c1 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 18 Sep 2023 22:09:31 -0400 Subject: [PATCH 05/17] Update bottin et bottin-ag --- bottin | 2 +- bottin-ag | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bottin b/bottin index 0b25ed6..bf12cd1 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit 0b25ed6562dff6576c72e067cd7ae583253f2ec4 +Subproject commit bf12cd123d94b3e6422409ffc4b7cfebf61bcc87 diff --git a/bottin-ag b/bottin-ag index 1b046cc..acc8b01 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 1b046cc5e0efa5a0fb5672bfc7167ad57b00ae00 +Subproject commit acc8b010adf912cce67c6280bb97df7b449f2fe6 From dcc10f064028a0d5a89eb129b92393158b0bc75a Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 18 Sep 2023 23:07:25 -0400 Subject: [PATCH 06/17] Update bottin -> v5.5.0 --- bottin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin b/bottin index bf12cd1..5f4c95b 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit bf12cd123d94b3e6422409ffc4b7cfebf61bcc87 +Subproject commit 5f4c95b1d458495bd43989e9b85870bcc14853ea From bf4e74c9269786a61ffd92ce3f629e67fa31a0a7 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 18 Sep 2023 23:20:29 -0500 Subject: [PATCH 07/17] Update bottin -> v5.5.1 --- bottin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin b/bottin index 5f4c95b..ae0f8fd 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit 5f4c95b1d458495bd43989e9b85870bcc14853ea +Subproject commit ae0f8fd38e421360c780398079797653a95e89de From 58ce4e24a61ad774a348352f64fde484c3696343 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 19 Sep 2023 16:52:13 -0400 Subject: [PATCH 08/17] Update bottin-ag -> v1.0.0-rc1 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index acc8b01..51c0930 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit acc8b010adf912cce67c6280bb97df7b449f2fe6 +Subproject commit 51c0930f98918633887e5dc581717e9cd4e3d065 From dc6bc00cbe6335bf169d89d93599ac5720859111 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 19 Sep 2023 17:00:58 -0400 Subject: [PATCH 09/17] Update bottin-ag -> v1.0.0-rc2 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index 51c0930..7351f97 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 51c0930f98918633887e5dc581717e9cd4e3d065 +Subproject commit 7351f970f7c41e0958fdd783e7dab2ce5fddd401 From 2b1956ac20a812f18b3112f34e3ef6bdbd55df1e Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 19 Sep 2023 18:27:29 -0400 Subject: [PATCH 10/17] Update bottin-ag -> v1.0.0-rc3 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index 7351f97..75b0819 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 7351f970f7c41e0958fdd783e7dab2ce5fddd401 +Subproject commit 75b0819ae42759c646781f36a6296329127795f9 From 59a6007416959196523c43e7bf0f5fe482923097 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Tue, 19 Sep 2023 19:23:02 -0400 Subject: [PATCH 11/17] Update bottin -> v5.6.0 --- bottin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin b/bottin index ae0f8fd..6d2062a 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit ae0f8fd38e421360c780398079797653a95e89de +Subproject commit 6d2062aecc9354a207633b00d0f15211af498696 From e46777359f0e16bf57f1f61e51a8c542bea04657 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Mon, 2 Oct 2023 14:09:35 -0400 Subject: [PATCH 12/17] Update bottin-ag -> v1.1.0 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index 75b0819..dc65ce6 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 75b0819ae42759c646781f36a6296329127795f9 +Subproject commit dc65ce6c4da19d02d91ec42ff0f479161b94d197 From 12b7a87b9cd5440286232f912f14c25172a52dbe Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Sun, 8 Oct 2023 01:41:44 -0400 Subject: [PATCH 13/17] Update bottin-ag -> v1.1.1 --- bottin-ag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin-ag b/bottin-ag index dc65ce6..4b42f8d 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit dc65ce6c4da19d02d91ec42ff0f479161b94d197 +Subproject commit 4b42f8d215afb895eacd85fc2416835e5a5d4b14 From 6e4d1869d617800484a14a08ebeee871a6918ae7 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Wed, 14 Feb 2024 14:54:27 -0500 Subject: [PATCH 14/17] =?UTF-8?q?Bump=20bottin=20et=20bottinag=20avec=20fo?= =?UTF-8?q?nctionalit=C3=A9=20de=20config=20par=20env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 29 +++++++++++++++++++++++++++++ bottin | 2 +- bottin-ag | 2 +- docker-compose.yaml | 19 +++++++++++++++++++ 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9263db0 --- /dev/null +++ b/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 +``` diff --git a/bottin b/bottin index 6d2062a..d48bf54 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit 6d2062aecc9354a207633b00d0f15211af498696 +Subproject commit d48bf545d7a26849c88b86588844713f6588554e diff --git a/bottin-ag b/bottin-ag index 4b42f8d..5c5ea71 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 4b42f8d215afb895eacd85fc2416835e5a5d4b14 +Subproject commit 5c5ea71622a9dc1dd654de216afdf16b67c2f3ad diff --git a/docker-compose.yaml b/docker-compose.yaml index 153646a..70bf456 100644 --- a/docker-compose.yaml +++ b/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: From 02078319a5f6e40b91abdf551ddf490dd810b202 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Wed, 14 Feb 2024 15:44:09 -0500 Subject: [PATCH 15/17] fix: ajouter env vars *_DB_HOST --- docker-compose.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yaml b/docker-compose.yaml index 70bf456..a0a48ad 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,6 +16,7 @@ services: 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}" @@ -33,6 +34,7 @@ services: 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}" @@ -62,6 +64,7 @@ services: BOTTINAG_API_KEY: "${BOTTINAG_API_KEY}" BOTTINAG_BOTTIN_API_KEY: "${BOTTIN_API_KEY}" 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: @@ -77,6 +80,7 @@ services: 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}" From f97b7d4ce6df93766b80a938fb6f2e7f7e862840 Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Wed, 14 Feb 2024 17:09:23 -0500 Subject: [PATCH 16/17] Update dependencies et fix env manquante --- bottin | 2 +- bottin-ag | 2 +- docker-compose.yaml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bottin b/bottin index d48bf54..4544940 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit d48bf545d7a26849c88b86588844713f6588554e +Subproject commit 4544940556ee6d795e3b5b2a721c46f939cbae54 diff --git a/bottin-ag b/bottin-ag index 5c5ea71..34ee2c0 160000 --- a/bottin-ag +++ b/bottin-ag @@ -1 +1 @@ -Subproject commit 5c5ea71622a9dc1dd654de216afdf16b67c2f3ad +Subproject commit 34ee2c095535f3cd6775936a28d5f2286904e33b diff --git a/docker-compose.yaml b/docker-compose.yaml index a0a48ad..91d6a23 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -58,11 +58,13 @@ 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}" From 8dfffd09e82e36e99c9741cfdfa42cecf243091b Mon Sep 17 00:00:00 2001 From: Victor Lacasse-Beaudoin Date: Thu, 15 Feb 2024 19:44:39 -0500 Subject: [PATCH 17/17] chores: bump bottin --- bottin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bottin b/bottin index 4544940..369332d 160000 --- a/bottin +++ b/bottin @@ -1 +1 @@ -Subproject commit 4544940556ee6d795e3b5b2a721c46f939cbae54 +Subproject commit 369332db26c281ab92db2aa187e56cc17533c2d7