From 59348a58ee512ea070c0530890e8419a15d6c181 Mon Sep 17 00:00:00 2001 From: "joel.clement" Date: Mon, 16 Oct 2023 15:49:17 +0200 Subject: [PATCH 1/7] TAXHUB_SETTINGS absolute path default --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 428a7a7..fa58d21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -124,7 +124,7 @@ services: <<: *env-defaults TAXHUB_APPLICATION_ROOT: "${TAXHUB_PREFIX}" TAXHUB_SQLALCHEMY_DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT:-5432}/${POSTGRES_DB} - TAXHUB_SETTINGS: ${TAXHUB_SETTINGS:-config.py} + TAXHUB_SETTINGS: ${TAXHUB_SETTINGS:-/dist/config/config.py} PYTHONPATH: /dist/config labels: - "traefik.enable=true" From 1ce625d1bb9510c9469a19a89a547701c9706022 Mon Sep 17 00:00:00 2001 From: TheoLechemia Date: Tue, 17 Oct 2023 16:52:03 +0200 Subject: [PATCH 2/7] bump GN --- sources/GeoNature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources/GeoNature b/sources/GeoNature index 0a3764b..2c74047 160000 --- a/sources/GeoNature +++ b/sources/GeoNature @@ -1 +1 @@ -Subproject commit 0a3764b29d83fb400b5bebb201bb94e353a915be +Subproject commit 2c74047daae1134adad6a4804396012beb5539b2 From a1ee7a3ee54669e94c105c6bdd718107f27a2210 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Tue, 17 Oct 2023 17:04:18 +0200 Subject: [PATCH 3/7] Bump GN to 2.13.3 --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7080efd..c015764 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -51,7 +51,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.13.2 + build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.13.3 frontend: name: Build geonature frontend docker image @@ -92,4 +92,4 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.13.2 + build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.13.3 From c6dd268e204ff52a41b8852360048738b3513377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Tue, 17 Oct 2023 20:01:59 +0200 Subject: [PATCH 4/7] gitignore: ignore docker-compose.override.yml --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 70cfd53..4264be7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .env +docker-compose.override.yml /config/ /data/ !data/**/.gitkeep From 4bd37fd3302a1a461273c12cb1ca7ce906a4eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Tue, 17 Oct 2023 22:50:56 +0200 Subject: [PATCH 5/7] taxhub: define required parameters through envvars --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fa58d21..7cbbbce 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -126,6 +126,10 @@ services: TAXHUB_SQLALCHEMY_DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT:-5432}/${POSTGRES_DB} TAXHUB_SETTINGS: ${TAXHUB_SETTINGS:-/dist/config/config.py} PYTHONPATH: /dist/config + TAXHUB_UPLOAD_FOLDER: "medias" + TAXHUB_SQLALCHEMY_TRACK_MODIFICATIONS: False + TAXHUB_COOKIE_EXPIRATION: 3600 + TAXHUB_PASS_METHOD: "hash" labels: - "traefik.enable=true" - "traefik.http.routers.taxhub.rule=Host(`${TAXHUB_HOST}`) && PathPrefix(`${TAXHUB_PREFIX}`)" From 57718161e4ea6d7d295ffc20037edd9d91a8f0e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Tue, 17 Oct 2023 22:51:22 +0200 Subject: [PATCH 6/7] remove useless PYTHONPATH envvars Same PYTHONPATH is already defined in Dockerfiles. --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7cbbbce..0b66ad5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -102,7 +102,6 @@ services: USERSHUB_ACTIVATE_API: ${USERSHUB_ACTIVATE_API:-true} USERSHUB_COOKIE_EXPIRATION: ${USERSHUB_COOKIE_EXPIRATION:-3600} USERSHUB_FILL_MD5_PASS: ${USERSHUB_FILL_MD5_PASS:-false} - PYTHONPATH: /dist/config labels: - "traefik.enable=true" - "traefik.http.routers.usershub.rule=Host(`${USERSHUB_HOST}`) && PathPrefix(`${USERSHUB_PREFIX}`)" @@ -125,7 +124,6 @@ services: TAXHUB_APPLICATION_ROOT: "${TAXHUB_PREFIX}" TAXHUB_SQLALCHEMY_DATABASE_URI: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT:-5432}/${POSTGRES_DB} TAXHUB_SETTINGS: ${TAXHUB_SETTINGS:-/dist/config/config.py} - PYTHONPATH: /dist/config TAXHUB_UPLOAD_FOLDER: "medias" TAXHUB_SQLALCHEMY_TRACK_MODIFICATIONS: False TAXHUB_COOKIE_EXPIRATION: 3600 From dc63127e2295e44d4f12c4ed379a0cb981b52172 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Wed, 18 Oct 2023 09:31:17 +0200 Subject: [PATCH 7/7] Changelog 2.13.3 --- docs/changelog.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/docs/changelog.md b/docs/changelog.md index 04592fe..b0acb0d 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,28 @@ CHANGELOG ========= +2.13.3 (2023-10-18) +------------------ + +**🏷️ Versions** + +- GeoNature 2.13.3 +- TaxHub 1.12.1 +- UsersHub 2.3.4 +- GeoNature-dashboard 1.4.0 +- GeoNature-export 1.6.0 +- GeoNature-import 2.2.3 +- GeoNature-monitoring 0.7.0 + +**🐛 Corrections** + +- Correction de la prise en compte de la configuration de TaxHub (#20) + +**⚠️ Notes de version** + +- Comme indiqué dans la procédure classique de mise à jour, vous devez télécharger la nouvelle version du dépôt (notamment pour mettre à jour le fichier `docker-compose.yml` qui a évolué dans cette version) +- Si vous l'aviez modifié localement, reportez les évolutions du fichier `docker-compose.yml` (#20), en y ajoutant les paramètres de TaxHub + 2.13.2 (2023-09-28) ------------------