Skip to content

Commit a0a02f4

Browse files
authored
Merge pull request #230 from OP-TED/feature/TED-663
fix docker compose network visibility
2 parents 9879f4d + 2cf89c2 commit a0a02f4

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ start-airflow-cluster: build-externals
116116

117117
start-airflow-cluster-worker: build-externals
118118
@ echo -e "$(BUILD_PRINT)Starting Airflow services $(END_BUILD_PRINT)"
119-
@ docker-compose -p ${ENVIRONMENT} --file ./infra/airflow-cluster/docker-compose.yaml --env-file ${ENV_FILE} up -d --force-recreate airflow-worker
119+
@ docker-compose -p ${ENVIRONMENT} --file ./infra/airflow-cluster/docker-compose.yaml --env-file ${ENV_FILE} up -d airflow-worker
120120

121121
stop-airflow-cluster:
122122
@ echo -e "$(BUILD_PRINT)Stopping Airflow Cluster $(END_BUILD_PRINT)"

infra/airflow-cluster/docker-compose.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ x-airflow-common:
5858
AIRFLOW__CORE__SQL_ALCHEMY_CONN: postgresql+psycopg2://airflow:airflow@ted-data.eu/airflow
5959
AIRFLOW__CELERY__RESULT_BACKEND: db+postgresql://airflow:airflow@ted-data.eu/airflow
6060
AIRFLOW__CELERY__BROKER_URL: redis://:@ted-data.eu:6379/0
61-
#AIRFLOW__WEBSERVER__SECRET_KEY: ${SECRET_KEY}
61+
AIRFLOW__WEBSERVER__SECRET_KEY: "zqOVjqVrMstjDbKEPpYiSA=="
6262
IS_PRIME_ENV: 'true'
6363
AIRFLOW__CORE__EXECUTOR: CeleryExecutor
64-
AIRFLOW__CORE__FERNET_KEY: ''
64+
AIRFLOW__CORE__FERNET_KEY: 'M9NmXPlfIszmYCVjp3nJNQEocpmNQtKQdG-Kxdvfgm8='
6565
AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION: 'true'
6666
AIRFLOW__CORE__ENABLE_XCOM_PICKLING: "true"
6767
AIRFLOW__CORE__LOAD_EXAMPLES: 'false'
@@ -114,6 +114,7 @@ services:
114114
restart: unless-stopped
115115
networks:
116116
- airflow
117+
- common-ext
117118

118119
redis:
119120
image: redis:latest
@@ -130,6 +131,7 @@ services:
130131
restart: unless-stopped
131132
networks:
132133
- airflow
134+
- common-ext
133135

134136
airflow-webserver:
135137
<<: *airflow-common
@@ -315,6 +317,7 @@ services:
315317
- airflow
316318
networks:
317319
- airflow
320+
- common-ext
318321

319322
flower:
320323
<<: *airflow-common
@@ -324,6 +327,7 @@ services:
324327
networks:
325328
- airflow
326329
- proxy-net
330+
- common-ext
327331
depends_on:
328332
<<: *airflow-common-depends-on
329333
airflow-init:

0 commit comments

Comments
 (0)