From 7dc0ae15b7a630e27f5d3d0bdb0fc48c8f0ea2b9 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Tue, 19 Sep 2023 15:59:05 +0200 Subject: [PATCH 1/5] Typos Changelog --- docs/changelog.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index ddd539c..8ea8832 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,14 +10,14 @@ CHANGELOG - TaxHub 1.12.1 - UsersHub 2.3.4 - GeoNature-dashboard 1.4.0 -- GeoNature-export1.6.0 +- GeoNature-export 1.6.0 - GeoNature-import 2.2.2 - GeoNature-monitoring 0.7.0 **✨ Améliorations** - Compléments de la documentation (Redirections, version, rebuild des images) -- Ajout de variables dans le `.env` pour pouvoir intégrer ou non les données initiales (référentiel de sensibilité, BDC statuts, zonages administratifs, mailles et données d"exemple) +- Ajout de variables dans le `.env` pour pouvoir intégrer ou non les données initiales (référentiel de sensibilité, BDC statuts, zonages administratifs, mailles et données d'exemple) **🐛 Corrections** @@ -53,6 +53,6 @@ Première version fonctionnelle de GeoNature-Docker-services, permettant de dép - TaxHub 1.12.1 - UsersHub 2.3.4 - GeoNature-dashboard 1.4.0 -- GeoNature-export1.6.0 +- GeoNature-export 1.6.0 - GeoNature-import 2.2.1 - GeoNature-monitoring 0.7.0 From 64473cc167cf59efbd0814ff0b96ede8f0cf7680 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Tue, 19 Sep 2023 16:04:41 +0200 Subject: [PATCH 2/5] Changelog - Another typo --- docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index 8ea8832..ea20342 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -26,7 +26,7 @@ CHANGELOG **⚠️ Notes de version** -Les modifications suivantes ont été apportées au fichier `docker-comopose.yml` : +Les modifications suivantes ont été apportées au fichier `docker-compose.yml` : - Ajout de la variable d’environnement `USERSHUB_FILL_MD5_PASS` au service UsersHub : ``` From 19e94a4321bb513fc09f71a343c288f6f03557c1 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 28 Sep 2023 17:29:10 +0200 Subject: [PATCH 3/5] Changelog 2.13.2 --- docs/changelog.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index ea20342..04592fe 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,12 +1,33 @@ CHANGELOG ========= +2.13.2 (2023-09-28) +------------------ + +**🏷️ Versions** + +- GeoNature 2.13.2 +- 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 + +**✨ Améliorations** + +- Mise à jour de Python en version 3.11 dans l'image Docker de GeoNature (#17) + +**🐛 Corrections** + +- Correction du chargement de la customisation (au niveau de GeoNature) + 0.2.0 (2023-09-19) ------------------ **🏷️ Versions** -- GeoNature 2.12.3 +- GeoNature 2.13.1 - TaxHub 1.12.1 - UsersHub 2.3.4 - GeoNature-dashboard 1.4.0 From 4bea06033e7945e037e46c6b135cfd3cf89ec1c9 Mon Sep 17 00:00:00 2001 From: Camille Monchicourt Date: Thu, 28 Sep 2023 17:30:41 +0200 Subject: [PATCH 4/5] Bump GN to 2.13.2 --- .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 95d849e..7080efd 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.1 + build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.13.2 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.1 + build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.13.2 From 7295db3772474f86a2f427fc1a9dc56c6cbf3ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Thu, 28 Sep 2023 17:52:44 +0200 Subject: [PATCH 5/5] bump sources MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gn_module_import 2.2.2 → 2.2.3 GeoNature 2.13.1 → 2.13.2 TaxHub 1.11.1 → 1.12.1 UsersHub 2.3.3 → 2.3.4 --- sources/GeoNature | 2 +- sources/TaxHub | 2 +- sources/UsersHub | 2 +- sources/gn_module_import | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/GeoNature b/sources/GeoNature index a978d6a..0a3764b 160000 --- a/sources/GeoNature +++ b/sources/GeoNature @@ -1 +1 @@ -Subproject commit a978d6aa6e2d85b51aa644f0e2aee74e67b1cb6d +Subproject commit 0a3764b29d83fb400b5bebb201bb94e353a915be diff --git a/sources/TaxHub b/sources/TaxHub index c08e8f3..4855eec 160000 --- a/sources/TaxHub +++ b/sources/TaxHub @@ -1 +1 @@ -Subproject commit c08e8f3f2248a8cc493136b6a2285bc513024a9f +Subproject commit 4855eec69b698eda65dfcf24643e7e6ad99c8ebb diff --git a/sources/UsersHub b/sources/UsersHub index 37587da..bc3bcfb 160000 --- a/sources/UsersHub +++ b/sources/UsersHub @@ -1 +1 @@ -Subproject commit 37587da6d18acc44e6e38585ff3b0d959d8f7eb7 +Subproject commit bc3bcfb3e0ec7c76c322294b817c14cc4938e851 diff --git a/sources/gn_module_import b/sources/gn_module_import index ae6f30c..74d7940 160000 --- a/sources/gn_module_import +++ b/sources/gn_module_import @@ -1 +1 @@ -Subproject commit ae6f30cacd2c6c7a5ef1b0f4926b9d9351e58a75 +Subproject commit 74d79409d849dbc5212382009cca9d2645a4bf1c