Skip to content

Commit 2968ac8

Browse files
committed
Bump to Airflow 1.10.7
1 parent 70892af commit 2968ac8

6 files changed

+38
-15
lines changed

Dockerfile

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# VERSION 1.10.6
1+
# VERSION 1.10.7
22
# AUTHOR: Matthieu "Puckel_" Roisil
33
# DESCRIPTION: Basic Airflow container
44
# BUILD: docker build --rm -t puckel/docker-airflow .
@@ -7,12 +7,12 @@
77
FROM python:3.7-slim-stretch
88
LABEL maintainer="Puckel_"
99

10-
# Never prompts the user for choices on installation/configuration of packages
10+
# Never prompt the user for choices on installation/configuration of packages
1111
ENV DEBIAN_FRONTEND noninteractive
1212
ENV TERM linux
1313

1414
# Airflow
15-
ARG AIRFLOW_VERSION=1.10.6
15+
ARG AIRFLOW_VERSION=1.10.7
1616
ARG AIRFLOW_USER_HOME=/usr/local/airflow
1717
ARG AIRFLOW_DEPS=""
1818
ARG PYTHON_DEPS=""
@@ -25,6 +25,9 @@ ENV LC_ALL en_US.UTF-8
2525
ENV LC_CTYPE en_US.UTF-8
2626
ENV LC_MESSAGES en_US.UTF-8
2727

28+
# Disable noisy "Handling signal" log messages:
29+
# ENV GUNICORN_CMD_ARGS --log-level WARNING
30+
2831
RUN set -ex \
2932
&& buildDeps=' \
3033
freetds-dev \
@@ -80,4 +83,4 @@ EXPOSE 8080 5555 8793
8083
USER airflow
8184
WORKDIR ${AIRFLOW_USER_HOME}
8285
ENTRYPOINT ["/entrypoint.sh"]
83-
CMD ["webserver"] # set default arg for entrypoint
86+
CMD ["webserver"]

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ For encrypted connection passwords (in Local or Celery Executor), you must have
6767

6868
docker run puckel/docker-airflow python -c "from cryptography.fernet import Fernet; FERNET_KEY = Fernet.generate_key().decode(); print(FERNET_KEY)"
6969

70-
## Configurating Airflow
70+
## Configuring Airflow
7171

7272
It's possible to set any configuration value for Airflow from environment variables, which are used over values from the airflow.cfg.
7373

@@ -124,4 +124,4 @@ You can also use this to run a bash shell or any other command in the same envir
124124

125125
# Wanna help?
126126

127-
Fork, improve and PR. ;-)
127+
Fork, improve and PR.

config/airflow.cfg

+13
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,14 @@ dag_discovery_safe_mode = True
174174
# The number of retries each task is going to have by default. Can be overridden at dag or task level.
175175
default_task_retries = 0
176176

177+
# Whether to serialises DAGs and persist them in DB.
178+
# If set to True, Webserver reads from DB instead of parsing DAG files
179+
# More details: https://airflow.apache.org/howto/enable-dag-serialization.html
180+
store_serialized_dags = False
181+
182+
# Updating serialized DAG can not be faster than a minimum interval to reduce database write rate.
183+
min_serialized_dag_update_interval = 30
184+
177185
[cli]
178186
# In what way should the cli access the API. The LocalClient will use the
179187
# database directly, while the json_client will use the api running on the
@@ -682,6 +690,11 @@ env_from_secret_ref =
682690
git_repo =
683691
git_branch =
684692
git_subpath =
693+
694+
# The specific rev or hash the git_sync init container will checkout
695+
# This becomes GIT_SYNC_REV environment variable in the git_sync init container for worker pods
696+
git_sync_rev =
697+
685698
# Use git_user and git_password for user authentication or git_ssh_key_secret_name and git_ssh_key_secret_key
686699
# for SSH authentication
687700
git_user =

docker-compose-CeleryExecutor.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
# - ./pgdata:/var/lib/postgresql/data/pgdata
1717

1818
webserver:
19-
image: puckel/docker-airflow:1.10.6
19+
image: puckel/docker-airflow:1.10.7
2020
restart: always
2121
depends_on:
2222
- postgres
@@ -43,7 +43,7 @@ services:
4343
retries: 3
4444

4545
flower:
46-
image: puckel/docker-airflow:1.10.6
46+
image: puckel/docker-airflow:1.10.7
4747
restart: always
4848
depends_on:
4949
- redis
@@ -55,7 +55,7 @@ services:
5555
command: flower
5656

5757
scheduler:
58-
image: puckel/docker-airflow:1.10.6
58+
image: puckel/docker-airflow:1.10.7
5959
restart: always
6060
depends_on:
6161
- webserver
@@ -74,7 +74,7 @@ services:
7474
command: scheduler
7575

7676
worker:
77-
image: puckel/docker-airflow:1.10.6
77+
image: puckel/docker-airflow:1.10.7
7878
restart: always
7979
depends_on:
8080
- scheduler

docker-compose-LocalExecutor.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
version: '2.1'
1+
version: '3.7'
22
services:
33
postgres:
44
image: postgres:9.6
55
environment:
66
- POSTGRES_USER=airflow
77
- POSTGRES_PASSWORD=airflow
88
- POSTGRES_DB=airflow
9+
logging:
10+
options:
11+
max-size: 10m
12+
max-file: "3"
913

1014
webserver:
11-
image: puckel/docker-airflow:1.10.6
15+
image: puckel/docker-airflow:1.10.7
1216
restart: always
1317
depends_on:
1418
- postgres
1519
environment:
1620
- LOAD_EX=n
1721
- EXECUTOR=Local
22+
logging:
23+
options:
24+
max-size: 10m
25+
max-file: "3"
1826
volumes:
1927
- ./dags:/usr/local/airflow/dags
20-
# Uncomment to include custom plugins
2128
# - ./plugins:/usr/local/airflow/plugins
2229
ports:
2330
- "8080:8080"

script/entrypoint.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export \
2727
AIRFLOW__CORE__SQL_ALCHEMY_CONN \
2828

2929

30-
# Load DAGs exemples (default: Yes)
30+
# Load DAGs examples (default: Yes)
3131
if [[ -z "$AIRFLOW__CORE__LOAD_EXAMPLES" && "${LOAD_EX:=n}" == n ]]
3232
then
3333
AIRFLOW__CORE__LOAD_EXAMPLES=False
@@ -79,7 +79,7 @@ case "$1" in
7979
exec airflow webserver
8080
;;
8181
worker|scheduler)
82-
# To give the webserver time to run initdb.
82+
# Give the webserver time to run initdb.
8383
sleep 10
8484
exec airflow "$@"
8585
;;

0 commit comments

Comments
 (0)