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

remove networks

parent 9a0a259b
Branches
No related tags found
1 merge request!4Add reverse proxy for https and certificate
Pipeline #95062 passed
...@@ -86,8 +86,6 @@ services: ...@@ -86,8 +86,6 @@ services:
- "certs:/etc/nginx/certs" - "certs:/etc/nginx/certs"
- "/run/docker.sock:/tmp/docker.sock:ro" - "/run/docker.sock:/tmp/docker.sock:ro"
restart: "always" restart: "always"
networks:
- "net"
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
...@@ -107,8 +105,6 @@ services: ...@@ -107,8 +105,6 @@ services:
restart: "always" restart: "always"
depends_on: depends_on:
- "reverse-proxy" - "reverse-proxy"
networks:
- "net"
postgres: postgres:
image: postgres:13 image: postgres:13
...@@ -123,8 +119,6 @@ services: ...@@ -123,8 +119,6 @@ services:
interval: 5s interval: 5s
retries: 5 retries: 5
restart: always restart: always
networks:
- "airflow"
redis: redis:
image: redis:latest image: redis:latest
...@@ -136,8 +130,6 @@ services: ...@@ -136,8 +130,6 @@ services:
timeout: 30s timeout: 30s
retries: 50 retries: 50
restart: always restart: always
networks:
- "airflow"
airflow-webserver: airflow-webserver:
<<: *airflow-common <<: *airflow-common
...@@ -148,7 +140,7 @@ services: ...@@ -148,7 +140,7 @@ services:
environment: environment:
VIRTUAL_HOST: datalogistics.eflows4hpc.eu VIRTUAL_HOST: datalogistics.eflows4hpc.eu
LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu
VIRTUAL_PORT: 7001 VIRTUAL_PORT: 8080
healthcheck: healthcheck:
test: ["CMD", "curl", "--fail", "http://localhost:8080/health"] test: ["CMD", "curl", "--fail", "http://localhost:8080/health"]
...@@ -160,9 +152,6 @@ services: ...@@ -160,9 +152,6 @@ services:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
airflow-init: airflow-init:
condition: service_completed_successfully condition: service_completed_successfully
networks:
- "net"
- "airflow"
airflow-scheduler: airflow-scheduler:
<<: *airflow-common <<: *airflow-common
...@@ -173,8 +162,6 @@ services: ...@@ -173,8 +162,6 @@ services:
timeout: 10s timeout: 10s
retries: 5 retries: 5
restart: always restart: always
networks:
- "airflow"
depends_on: depends_on:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
airflow-init: airflow-init:
...@@ -196,8 +183,6 @@ services: ...@@ -196,8 +183,6 @@ services:
# See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation # See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation
DUMB_INIT_SETSID: "0" DUMB_INIT_SETSID: "0"
restart: always restart: always
networks:
- "airflow"
volumes: volumes:
- ./dags:/opt/airflow/dags - ./dags:/opt/airflow/dags
- ./config/airflow.cfg:/opt/airflow/airflow.cfg - ./config/airflow.cfg:/opt/airflow/airflow.cfg
...@@ -222,8 +207,6 @@ services: ...@@ -222,8 +207,6 @@ services:
# See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation # See https://airflow.apache.org/docs/docker-stack/entrypoint.html#signal-propagation
DUMB_INIT_SETSID: "0" DUMB_INIT_SETSID: "0"
restart: always restart: always
networks:
- "airflow"
depends_on: depends_on:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
airflow-init: airflow-init:
...@@ -303,8 +286,6 @@ services: ...@@ -303,8 +286,6 @@ services:
_AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME:-airflow} _AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME:-airflow}
_AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow} _AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD:-airflow}
user: "0:0" user: "0:0"
networks:
- "airflow"
volumes: volumes:
- .:/sources - .:/sources
...@@ -320,8 +301,6 @@ services: ...@@ -320,8 +301,6 @@ services:
- bash - bash
- -c - -c
- airflow - airflow
networks:
- "airflow"
airflow-setup: airflow-setup:
<<: *airflow-common <<: *airflow-common
...@@ -340,8 +319,6 @@ services: ...@@ -340,8 +319,6 @@ services:
<<: *airflow-common-depends-on <<: *airflow-common-depends-on
airflow-init: airflow-init:
condition: service_completed_successfully condition: service_completed_successfully
networks:
- "airflow"
volumes: volumes:
postgres-db-volume: postgres-db-volume:
...@@ -350,9 +327,3 @@ volumes: ...@@ -350,9 +327,3 @@ volumes:
vhost: vhost:
dhparam: dhparam:
networks:
net:
external: true
airflow:
external: true
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment