Merge pull request #43 from PnX-SI/fix/2.15

fix add extension ltree and remove taxhub from build.sh
PnX-SI · Nov 27, 2024 · 90749b7 · 90749b7
2 parents bd95148 + d3cff92
commit 90749b7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/assets/postgres/initdb/add-extensions.sql b/assets/postgres/initdb/add-extensions.sql
@@ -2,6 +2,8 @@ CREATE EXTENSION IF NOT EXISTS "hstore";
 CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
 CREATE EXTENSION IF NOT EXISTS "pg_trgm";
 CREATE EXTENSION IF NOT EXISTS "unaccent";
+CREATE EXTENSION IF NOT EXISTS "ltree";
+
 
 
 CREATE EXTENSION IF NOT EXISTS "postgis";

diff --git a/build/build.sh b/build/build.sh
@@ -29,8 +29,6 @@ docker build \
     -f ./build/Dockerfile-geonature-frontend \
     -t ${GEONATURE_FRONTEND_EXTRA_IMAGE} .
 
-# TaxHub
-docker build -f sources/TaxHub/Dockerfile -t ${TAXHUB_IMAGE} --target=prod sources/TaxHub/
 
 # UsersHub
 docker build -f sources/UsersHub/Dockerfile -t ${USERSHUB_IMAGE} --target=prod sources/UsersHub/
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -83,13 +83,23 @@ services:
       - postgres:/var/lib/postgresql/data
     healthcheck:
       # during db init, postgres is not listening on localhost so this avoid false healthy status
-      test: ["CMD", "pg_isready", "-d", "${POSTGRES_DB}", "-U", "${POSTGRES_USER}", "-h", "localhost"]
+      test:
+        [
+          "CMD",
+          "pg_isready",
+          "-d",
+          "${POSTGRES_DB}",
+          "-U",
+          "${POSTGRES_USER}",
+          "-h",
+          "localhost",
+        ]
       interval: 10s
       timeout: 5s
       retries: 5
 
   usershub:
-    <<: [*restart-policy,*defaults]
+    <<: [*restart-policy, *defaults]
     image: ${USERSHUB_IMAGE}
     depends_on:
       postgres:
@@ -126,11 +136,9 @@ services:
       install_ref_sensitivity: ${GEONATURE_DB_INSTALL_REF_SENSITIVITY:-true}
       usershub: ${GEONATURE_DB_INSTALL_USERSHUB:-true}
       usershub_samples: ${GEONATURE_DB_INSTALL_USERSHUB_SAMPLES:-true}
-      taxhub: ${GEONATURE_DB_INSTALL_TAXHUB:-true}
-      taxhub_samples: ${GEONATURE_DB_INSTALL_TAXHUB_SAMPLES:-true}
 
   geonature-worker:
-    <<: [*restart-policy,*geonature-backend-defaults]
+    <<: [*restart-policy, *geonature-backend-defaults]
     depends_on:
       <<: *geonature-depends-on-defaults
       geonature-install-db:
@@ -139,7 +147,7 @@ services:
     command: celery -A geonature.celery_app:app worker --beat --schedule-filename=/dist/media/celerybeat-schedule.db
 
   geonature-backend:
-    <<: [*restart-policy,*geonature-backend-defaults]
+    <<: [*restart-policy, *geonature-backend-defaults]
     depends_on:
       <<: *geonature-depends-on-defaults
       geonature-install-db:

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,22 @@
 # CHANGELOG
 
+## 2.15.0
+
+**🏷️ Versions**
+
+- GeoNature 2.15.0
+- UsersHub 2.4.4
+- GeoNature-dashboard 1.5.0
+- GeoNature-export 1.7.2
+- GeoNature-monitoring 0.7.3
+
+**⚠️ Notes de version**
+
+- TaxHub est intégré à GeoNature par conséquent il n'y auras plus de container TaxHub
+- Pour le fonctionnement de la base de donnée il faut installer l'extension ltree dans le container postgre, vous pouvez le faire avec la commande suivante :
+  - docker compose exec postgres psql -U {POSTGRES_USER} -d {POSTGRES_DB} -f /docker-entrypoint-initdb.d/add-extensions.sql
+
+
 ## 2.14.2 (2024-06-03)
 
 - GeoNature 2.14.2