Merge branch 'develop'

PnX-SI · Feb 29, 2024 · 55cc8e9 · 55cc8e9
2 parents 23f0461 + e671ad1
commit 55cc8e9
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 10 deletions.
diff --git 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.4
+          build-args: GEONATURE_BACKEND_IMAGE=ghcr.io/pnx-si/geonature-backend:2.14.0
 
   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.4
+          build-args: GEONATURE_FRONTEND_IMAGE=ghcr.io/pnx-si/geonature-frontend:2.14.0
diff --git a/README.md b/README.md
@@ -22,7 +22,10 @@ De plus, celui-ci fournit une image Docker de GeoNature contenant, outre les mod
   - `config/taxhub/config.py`
 - Lancer les conteneurs : `docker compose up -d`
 
-Les logs sont accessibles avec la commande `docker compose logs -f` ou `docker compose -f <nom du service>` (avec l'option `-n100` pour ne renvoyer que les 100 dernières lignes des logs).
+Les logs de tous les services sont accessibles avec la commande `docker compose logs -f`.
+Pour n'afficher que les 100 dernières lignes, on utilise l'option `--tail 100` et donc la commande `docker compose logs -f --tail 100`.
+Pour n'afficher les logs que d'un service en particulier, on utilise la commande `docker compose logs -f <nom du service>`.
+
 
 ## Les services
 

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,18 @@
 # CHANGELOG
 
+
+## 2.14.0 (2024-02-29)
+
+**🏷️ Versions**
+
+- GeoNature 2.14.0
+- TaxHub 1.13.3
+- UsersHub 2.4.0
+- GeoNature-dashboard 1.5.0
+- GeoNature-export 1.7.0
+- GeoNature-import 2.3.0
+- GeoNature-monitoring 0.7.2
+
 ## 2.13.4 (2023-12-15)
 
 **🏷️ Versions**

diff --git a/sources/GeoNature b/sources/GeoNature
diff --git a/sources/TaxHub b/sources/TaxHub
diff --git a/sources/UsersHub b/sources/UsersHub
diff --git a/sources/gn_module_dashboard b/sources/gn_module_dashboard
diff --git a/sources/gn_module_export b/sources/gn_module_export
diff --git a/sources/gn_module_import b/sources/gn_module_import
diff --git a/sources/gn_module_monitoring b/sources/gn_module_monitoring