Skip to content
Snippets Groups Projects
Commit 2951ae61 authored by Christian Boettcher's avatar Christian Boettcher
Browse files

Merge branch 'main' of gitlab.jsc.fz-juelich.de:eflows4hpc-wp2/data-logistics-service into main

parents 90b40fb9 805ac9c4
Branches
Tags
No related merge requests found
Pipeline #95196 passed
...@@ -75,6 +75,37 @@ x-airflow-common: ...@@ -75,6 +75,37 @@ x-airflow-common:
condition: service_healthy condition: service_healthy
services: services:
reverse-proxy:
image: "jwilder/nginx-proxy:alpine"
container_name: "reverse-proxy"
volumes:
- "html:/usr/share/nginx/html"
- "dhparam:/etc/nginx/dhparam"
- "vhost:/etc/nginx/vhost.d"
- "certs:/etc/nginx/certs"
- "/run/docker.sock:/tmp/docker.sock:ro"
restart: "always"
ports:
- "80:80"
- "443:443"
letsencrypt:
image: "jrcs/letsencrypt-nginx-proxy-companion:latest"
container_name: "letsencrypt-helper"
volumes:
- "html:/usr/share/nginx/html"
- "dhparam:/etc/nginx/dhparam"
- "vhost:/etc/nginx/vhost.d"
- "certs:/etc/nginx/certs"
- "/run/docker.sock:/var/run/docker.sock:ro"
environment:
NGINX_PROXY_CONTAINER: "reverse-proxy"
DEFAULT_EMAIL: "m.petrova@fz-juelich.de"
restart: "always"
depends_on:
- "reverse-proxy"
postgres: postgres:
image: postgres:13 image: postgres:13
environment: environment:
...@@ -105,6 +136,13 @@ services: ...@@ -105,6 +136,13 @@ services:
command: webserver command: webserver
ports: ports:
- 7001:8080 - 7001:8080
environment:
<<: *airflow-common-env
VIRTUAL_HOST: datalogistics.eflows4hpc.eu
LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu
VIRTUAL_PORT: 8080
healthcheck: healthcheck:
test: ["CMD", "curl", "--fail", "http://localhost:8080/health"] test: ["CMD", "curl", "--fail", "http://localhost:8080/health"]
interval: 60s interval: 60s
...@@ -285,3 +323,8 @@ services: ...@@ -285,3 +323,8 @@ services:
volumes: volumes:
postgres-db-volume: postgres-db-volume:
certs:
html:
vhost:
dhparam:
...@@ -53,6 +53,8 @@ runcmd: ...@@ -53,6 +53,8 @@ runcmd:
- echo "Current user is $(whoami)" - echo "Current user is $(whoami)"
- sudo -u airflow git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git ./data-logistics-service - sudo -u airflow git clone https://gitlab.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service.git ./data-logistics-service
- cd ./data-logistics-service - cd ./data-logistics-service
- docker network create net
- docker network create airflow
- touch /finished_cloudinit - touch /finished_cloudinit
final_message: "The system is finally up, after $UPTIME seconds" final_message: "The system is finally up, after $UPTIME seconds"
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment