From 497d8746a60d3816e5d553f1851e390a8d7c6de0 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Fri, 13 Dec 2024 16:50:02 +0100
Subject: [PATCH 1/2] feat: add data-api

---
 .envs-hosts        |  1 +
 config             |  2 +-
 docker-compose.yml | 26 ++++++++++++++++++++++++--
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/.envs-hosts b/.envs-hosts
index 9f7dc1e..f514906 100644
--- a/.envs-hosts
+++ b/.envs-hosts
@@ -15,6 +15,7 @@ KB_PORT=5601
 ES_HOST=elasticsearch
 ES_PORT=9200
 RABBITMQ_HOST=rabbitmq
+DATA_API_HOST=data-api
 
 # needed for geonetwork entrypoint DO NOT REMOVE
 CONSOLE_URL=http://${CONSOLE_HOST}:8080
diff --git a/config b/config
index fb59e3c..f7e8651 160000
--- a/config
+++ b/config
@@ -1 +1 @@
-Subproject commit fb59e3c629fba322fd1bf183f9b154bc6cbb85b4
+Subproject commit f7e8651f3febe06f4ed583827ddb5058c577a90d
diff --git a/docker-compose.yml b/docker-compose.yml
index 94ce90d..945f227 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -314,7 +314,7 @@ services:
       - georchestra_datadir:/etc/georchestra
       - datafeeder_uploads:/tmp/datafeeder
     environment:
-      - JAVA_OPTS=-Xms512m -Xmx512m
+      - JAVA_OPTS=-Xms512m -Xmx512m -Dspring.profiles.active=georchestra,data-api-schemas -Dspring.config.additional-location=file:/etc/georchestra/data-api/application.yaml
       # You can set a higher loglevel this way: (ref. https://docs.spring.io/spring-boot/docs/2.1.13.RELEASE/reference/html/boot-features-logging.html#boot-features-custom-log-levels)
       - LOGGING_LEVEL_ORG_GEORCHESTRA_DATAFEEDER=INFO
     env_file:
@@ -412,4 +412,26 @@ services:
       - 'rabbitmq_data:/bitnami/rabbitmq/mnesia'
     restart: always
 
-      
+  data-api:
+    image: georchestra/data-api:1.3.0
+    healthcheck:
+      test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/data/ogcapi >/dev/null || exit 1" ]
+      interval: 30s
+      timeout: 10s
+      retries: 10
+    depends_on:
+      database:
+        condition: service_healthy
+    volumes:
+      - georchestra_datadir:/etc/georchestra
+    environment:
+      SPRING_PROFILES_ACTIVE: postgis
+      LOGGING_LEVEL_COM_CAMPTOCAMP: DEBUG
+      LOGGING_LEVEL_ORG_GEOTOOLS: DEBUG
+      SERVER_SERVLET_CONTEXT_PATH: /data
+      POSTGRES_HOST: postgis
+      POSTGRES_PORT: 5432
+      POSTGRES_DB: datafeeder
+      POSTGRES_USER: georchestra
+      POSTGRES_PASSWORD: georchestra
+      JAVA_TOOL_OPTIONS: "-Ddataapi.configdir=/etc/georchestra"

From 1840963f2e981ea04490828cf265120acfff38b8 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Fri, 13 Dec 2024 17:12:53 +0100
Subject: [PATCH 2/2] feat: ne curl and no wget in image

---
 docker-compose.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 945f227..34bf78a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -414,11 +414,11 @@ services:
 
   data-api:
     image: georchestra/data-api:1.3.0
-    healthcheck:
-      test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/data/ogcapi >/dev/null || exit 1" ]
-      interval: 30s
-      timeout: 10s
-      retries: 10
+#    healthcheck:
+#      test: [ "CMD-SHELL", "curl -s -f http://localhost:8080/data/ogcapi >/dev/null || exit 1" ]
+#      interval: 30s
+#      timeout: 10s
+#      retries: 10
     depends_on:
       database:
         condition: service_healthy