Extract gets db params from the environment section (#6)

* Define extract database parameters from the environment section * Add basic readme file --------- Co-authored-by: Andrey Rusakov <[email protected]>
camptocamp · Jul 17, 2024 · f129bdf · f129bdf
1 parent 1047c8c
commit f129bdf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,16 @@
+assit-asso-extract docker package
+=====
+
+## Demo and the config for Extract and Geoshop
+
+This repository contains a working example of the 
+[Extract](https://github.com/asit-asso/extract/) interacting with [Geoshop](https://github.com/camptocamp/geoshop-back/).
+
+### Based on
+* [Extract](https://github.com/asit-asso/extract)
+* [Geoshop Extract connector](https://github.com/sitn/sitn_geoshop_connector)
+* [Geoshop backend](https://github.com/camptocamp/geoshop-back/)
+
+### How to run
+It should be enough to run ```docker compose up```, docker will build all the images and start the containers.
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -8,8 +8,12 @@ services:
         depends_on:
             pgsql:
                 condition: service_healthy
-        environment:
-            - JAVA_OPTS=-Xms1G -Xmx2G -Duser.language=fr -Duser.region=CH -Dcom.sun.jndi.ldap.connect.pool.timeout=20000
+        environment: 
+            - JAVA_OPTS=-Xms1G -Xmx2G 
+              -Dspring.datasource.url="jdbc:postgresql://pgsql:5432/extract" 
+              -Dspring.datasource.username=extractuser 
+              -Dspring.datasource.password=demopassword 
+              -Duser.language=en -Duser.region=CH -Dcom.sun.jndi.ldap.connect.pool.timeout=20000
         ports:
             - "8080:8080"
         healthcheck:
@@ -48,7 +52,7 @@ services:
         volumes:
           - ./geoshop/postgis:/docker-entrypoint-initdb.d/
         healthcheck:
-            test: ["CMD-SHELL", "pg_isready -U postgres"]
+            test: ["CMD-SHELL", "pg_isready -U geoshop"]
             interval: 5s
             timeout: 5s
             retries: 5
@@ -63,7 +67,7 @@ services:
         ports:
             - "5432:5432"
         healthcheck:
-            test: ["CMD-SHELL", "pg_isready -U postgres"]
+            test: ["CMD-SHELL", "pg_isready -U extract"]
             interval: 5s
             timeout: 5s
             retries: 5
@@ -132,7 +136,6 @@ services:
                 condition: service_started
         build:
             context: ./qgis
-        image: reverseauth:0.5
         hostname: qgisproxy
         container_name: qgisproxy
         volumes: