diff --git a/dockers/docker-compose.yaml b/dockers/docker-compose.yaml index 7b9831dbd0e82c886d1516645dee7d60e406f91a..9bf8313f4423758cddc8a2c1d2a0d8dd4e4b1171 100644 --- a/dockers/docker-compose.yaml +++ b/dockers/docker-compose.yaml @@ -44,9 +44,7 @@ x-airflow-common: # In order to add custom dependencies or upgrade provider packages you can use your extended image. # Comment the image line, place your Dockerfile in the directory where you placed the docker-compose.yaml # and uncomment the "build" line below, Then run `docker-compose build` to build the images. - # image: ${AIRFLOW_IMAGE_NAME:-registry.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/eflows-airflow} - # image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.2.3} - image: ${AIRFLOW_IMAGE_NAME:-petrova1/my-airflow-img:beta2} + image: ${AIRFLOW_IMAGE_NAME:-registry.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/eflows-airflow} # build: . environment: &airflow-common-env @@ -79,35 +77,35 @@ x-airflow-common: 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" + 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" + 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: image: postgres:13 @@ -140,11 +138,11 @@ services: ports: - 7001:8080 - # environment: - # <<: *airflow-common-env - # VIRTUAL_HOST: datalogistics.eflows4hpc.eu - # LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu - # VIRTUAL_PORT: 8080 + environment: + <<: *airflow-common-env + VIRTUAL_HOST: datalogistics.eflows4hpc.eu + LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu + VIRTUAL_PORT: 8080 healthcheck: test: ["CMD", "curl", "--fail", "http://localhost:8080/health"] @@ -216,7 +214,7 @@ services: <<: *airflow-common-depends-on airflow-init: condition: service_completed_successfully - + airflow-init: <<: *airflow-common entrypoint: /bin/bash @@ -324,7 +322,7 @@ services: <<: *airflow-common-depends-on airflow-init: condition: service_completed_successfully - + docker-socket-proxy: image: tecnativa/docker-socket-proxy:latest environment: