Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract gets db params from the environment section #6

Merged
merged 2 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

13 changes: 8 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -132,7 +136,6 @@ services:
condition: service_started
build:
context: ./qgis
image: reverseauth:0.5
hostname: qgisproxy
container_name: qgisproxy
volumes:
Expand Down