Skip to content

Commit 99ed4fd

Browse files
committed
Additional config
1 parent 1621939 commit 99ed4fd

File tree

2 files changed

+33
-9
lines changed

2 files changed

+33
-9
lines changed

.env.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ _AIRFLOW_WWW_USER_CREATE=${_AIRFLOW_WWW_USER_CREATE:-True}
33
_AIRFLOW_WWW_USER_USERNAME=${_AIRFLOW_WWW_USER_USERNAME}
44
_AIRFLOW_WWW_USER_PASSWORD=${_AIRFLOW_WWW_USER_PASSWORD}
55
_AIRFLOW_WWW_USER_EMAIL=${_AIRFLOW_WWW_USER_EMAIL}
6-
_AIRFLOW_WWW_USER_FIRST_NAME=${_AIRFLOW_WWW_USER_FIRST_NAME}
7-
_AIRFLOW_WWW_USER_LAST_NAME=${_AIRFLOW_WWW_USER_LAST_NAME}
6+
_AIRFLOW_WWW_USER_FIRSTNAME=${_AIRFLOW_WWW_USER_FIRSTNAME}
7+
_AIRFLOW_WWW_USER_LASTNAME=${_AIRFLOW_WWW_USER_LASTNAME}
8+
_AIRFLOW_WWW_USER_ROLE=${_AIRFLOW_WWW_USER_ROLE}
89
_PIP_ADDITIONAL_REQUIREMENTS=${_PIP_ADDITIONAL_REQUIREMENTS}
910
AIRFLOW__API__AUTH_BACKENDS=${AIRFLOW__API__AUTH_BACKENDS:-"airflow.api.auth.backend.basic_auth"}
1011
AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION=${AIRFLOW__CORE__DAGS_ARE_PAUSED_AT_CREATION}

containers/compose-base.yaml

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ x-airflow-common:
1717
_AIRFLOW_DB_UPGRADE: ${_AIRFLOW_DB_UPGRADE}
1818
_AIRFLOW_WWW_USER_CREATE: ${_AIRFLOW_WWW_USER_CREATE}
1919
_AIRFLOW_WWW_USER_EMAIL: ${_AIRFLOW_WWW_USER_EMAIL}
20-
_AIRFLOW_WWW_USER_FIRST_NAME: ${_AIRFLOW_WWW_USER_FIRST_NAME}
21-
_AIRFLOW_WWW_USER_LAST_NAME: ${_AIRFLOW_WWW_USER_LAST_NAME}
20+
_AIRFLOW_WWW_USER_FIRSTNAME: ${_AIRFLOW_WWW_USER_FIRSTNAME}
21+
_AIRFLOW_WWW_USER_LASTNAME: ${_AIRFLOW_WWW_USER_LASTNAME}
2222
_AIRFLOW_WWW_USER_PASSWORD: ${_AIRFLOW_WWW_USER_PASSWORD}
2323
_AIRFLOW_WWW_USER_USERNAME: ${_AIRFLOW_WWW_USER_USERNAME}
24+
_AIRFLOW_WWW_USER_ROLE: ${_AIRFLOW_WWW_USER_ROLE}
2425
AIRFLOW_FILES_PATH_DIR_HOST: ${AIRFLOW_FILES_PATH_DIR_HOST}
2526
AIRFLOW_PORT: ${AIRFLOW_PORT}
2627
AIRFLOW__API__AUTH_BACKENDS: ${AIRFLOW__API__AUTH_BACKENDS}
@@ -122,6 +123,28 @@ services:
122123
volumes:
123124
- redis:/data
124125

126+
flower:
127+
platform: linux/amd64
128+
image: mher/flower:0.9.7
129+
restart: unless-stopped
130+
env_file:
131+
- ../.env
132+
depends_on:
133+
- redis
134+
command: [
135+
"flower",
136+
"--broker=redis://redis:6379/0",
137+
"--port=8888",
138+
"--basic_auth=admin:${FLOWER_PASSWORD}"]
139+
ports:
140+
- ${FLOWER_PORT}:8888
141+
healthcheck:
142+
test: ["CMD", "wget", "--quiet", "--spider", "http://localhost:8888/healthcheck"]
143+
interval: 60s
144+
timeout: 10s
145+
retries: 5
146+
start_period: 40s # requires docker-compose 3.4
147+
125148
minio:
126149
platform: linux/amd64
127150
image: quay.io/minio/minio
@@ -162,7 +185,7 @@ services:
162185
- ${AIRFLOW_PORT}:8080
163186
depends_on:
164187
<<: *airflow-common-depends-on
165-
startup:
188+
airflow_startup:
166189
condition: service_completed_successfully
167190

168191
airflow_scheduler:
@@ -180,7 +203,7 @@ services:
180203
restart: always
181204
depends_on:
182205
<<: *airflow-common-depends-on
183-
startup:
206+
airflow_startup:
184207
condition: service_completed_successfully
185208

186209
airflow_worker:
@@ -205,7 +228,7 @@ services:
205228
restart: always
206229
depends_on:
207230
<<: *airflow-common-depends-on
208-
startup:
231+
airflow_startup:
209232
condition: service_completed_successfully
210233

211234
airflow_triggerer:
@@ -223,7 +246,7 @@ services:
223246
restart: always
224247
depends_on:
225248
<<: *airflow-common-depends-on
226-
startup:
249+
airflow_startup:
227250
condition: service_completed_successfully
228251

229252
airflow_startup:
@@ -236,7 +259,7 @@ services:
236259
- -c
237260
- |
238261
mkdir -p /sources/logs /sources/dags /sources/plugins
239-
chown -R "${AIRFLOW_UID}:0" /sources/{logs,dags,plugins}
262+
chown -R "${HOST_UID}:0" /sources/{logs,dags,plugins}
240263
exec /entrypoint airflow version
241264
# yamllint enable rule:line-length
242265
environment:

0 commit comments

Comments
 (0)