diff --git a/dockers/docker-compose.yaml b/dockers/docker-compose.yaml index f9d8a0b728d31fc43598d2f685f75c6a11137394..06f68f0378444474a77aa3454822e14fac140d2f 100644 --- a/dockers/docker-compose.yaml +++ b/dockers/docker-compose.yaml @@ -86,8 +86,6 @@ services: - "certs:/etc/nginx/certs" - "/run/docker.sock:/tmp/docker.sock:ro" restart: "always" - networks: - - "net" ports: - "80:80" - "443:443" @@ -107,8 +105,6 @@ services: restart: "always" depends_on: - "reverse-proxy" - networks: - - "net" postgres: image: postgres:13 @@ -123,8 +119,6 @@ services: interval: 5s retries: 5 restart: always - networks: - - "airflow" redis: image: redis:latest @@ -136,8 +130,6 @@ services: timeout: 30s retries: 50 restart: always - networks: - - "airflow" airflow-webserver: <<: *airflow-common @@ -148,7 +140,7 @@ services: environment: VIRTUAL_HOST: datalogistics.eflows4hpc.eu LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu - VIRTUAL_PORT: 7001 + VIRTUAL_PORT: 8080 healthcheck: test: ["CMD", "curl", "--fail", "http://localhost:8080/health"] @@ -160,9 +152,6 @@ services: <<: *airflow-common-depends-on airflow-init: condition: service_completed_successfully - networks: - - "net" - - "airflow" airflow-scheduler: <<: *airflow-common @@ -173,8 +162,6 @@ services: timeout: 10s retries: 5 restart: always - networks: - - "airflow" depends_on: <<: *airflow-common-depends-on airflow-init: @@ -196,8 +183,6 @@ services: # See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation DUMB_INIT_SETSID: "0" restart: always - networks: - - "airflow" volumes: - ./dags:/opt/airflow/dags - ./config/airflow.cfg:/opt/airflow/airflow.cfg @@ -222,8 +207,6 @@ services: # See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation DUMB_INIT_SETSID: "0" restart: always - networks: - - "airflow" depends_on: <<: *airflow-common-depends-on airflow-init: @@ -303,8 +286,6 @@ services: _AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME:-airflow} _AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow} user: "0:0" - networks: - - "airflow" volumes: - .:/sources @@ -320,8 +301,6 @@ services: - bash - -c - airflow - networks: - - "airflow" airflow-setup: <<: *airflow-common @@ -340,8 +319,6 @@ services: <<: *airflow-common-depends-on airflow-init: condition: service_completed_successfully - networks: - - "airflow" volumes: postgres-db-volume: @@ -349,10 +326,4 @@ volumes: html: vhost: dhparam: - -networks: - net: - external: true - airflow: - external: true