From ec56f7e876555e4ef48d14af9a8b92e81089224b Mon Sep 17 00:00:00 2001 From: Oliver <20188437+olivergrabinski@users.noreply.github.com> Date: Wed, 3 Apr 2024 09:50:52 +0200 Subject: [PATCH] Update docker-compose with optional way to run the ship --- tests/docker/config/external-ship.conf | 15 +++++++++++++ tests/docker/config/nginx.conf | 18 +++++++++++++++ tests/docker/docker-compose.yml | 31 ++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 tests/docker/config/external-ship.conf create mode 100644 tests/docker/config/nginx.conf diff --git a/tests/docker/config/external-ship.conf b/tests/docker/config/external-ship.conf new file mode 100644 index 0000000000..266d876e24 --- /dev/null +++ b/tests/docker/config/external-ship.conf @@ -0,0 +1,15 @@ +ship { + + database.access.host = "postgres" + +// organizations { +// values { +// example = "An example org" +// } +// } + +// project-mapping { +// "org/proj": "neworg/newproject" +// } + +} \ No newline at end of file diff --git a/tests/docker/config/nginx.conf b/tests/docker/config/nginx.conf new file mode 100644 index 0000000000..46ff6753f8 --- /dev/null +++ b/tests/docker/config/nginx.conf @@ -0,0 +1,18 @@ +server { + listen 80; + server_name localhost; + resolver 127.0.0.11; + + location / { + proxy_pass http://web:8000; + } + location /v1 { + proxy_pass http://delta:8080; + } + location /blazegraph { + proxy_pass http://blazegraph:9999; + } + location /elasticsearch/ { + proxy_pass http://elasticsearch:9200/; + } +} \ No newline at end of file diff --git a/tests/docker/docker-compose.yml b/tests/docker/docker-compose.yml index 0107119452..7588e72ea1 100644 --- a/tests/docker/docker-compose.yml +++ b/tests/docker/docker-compose.yml @@ -171,3 +171,34 @@ services: default: # Set the container IP address in the 10.0.2.0/24 subnet ipv4_address: 10.0.2.20 + +# fusion: +# depends_on: +# - delta +# image: bluebrain/nexus-web:1.9.9 +# environment: +# BASE_PATH: "/" +# HOST_NAME: "http://localhost" +# API_ENDPOINT: "http://localhost/v1" + +# router: +# depends_on: +# - web +# image: nginx:stable +# ports: +# - target: 80 +# published: 80 +# mode: host +# deploy: +# mode: global +# volumes: +# - ./config/nginx.conf:/etc/nginx/conf.d/default.conf + +# ship: +# depends_on: +# - postgres +# image: bluebrain/nexus-ship:latest +# command: run --file "/tmp/export.json" --config "/config/external-ship.conf" +# volumes: +# - /tmp/ship:/tmp # put the export file in /tmp/ship locally +# - ./config:/config \ No newline at end of file