Merge pull request #3 from puckel/master

update

Dockerfile

@@ -1,18 +1,18 @@
-# VERSION 1.10.6
+# VERSION 1.10.9
 # AUTHOR: Matthieu "Puckel_" Roisil
 # DESCRIPTION: Basic Airflow container
 # BUILD: docker build --rm -t puckel/docker-airflow .
 # SOURCE: https://github.com/puckel/docker-airflow
 
-FROM python:3.7-slim-stretch
+FROM python:3.7-slim-buster
 LABEL maintainer="Puckel_"
 
-# Never prompts the user for choices on installation/configuration of packages
+# Never prompt the user for choices on installation/configuration of packages
 ENV DEBIAN_FRONTEND noninteractive
 ENV TERM linux
 
 # Airflow
-ARG AIRFLOW_VERSION=1.10.6
+ARG AIRFLOW_VERSION=1.10.9
 ARG AIRFLOW_USER_HOME=/usr/local/airflow
 ARG AIRFLOW_DEPS=""
 ARG PYTHON_DEPS=""
@@ -25,6 +25,9 @@ ENV LC_ALL en_US.UTF-8
 ENV LC_CTYPE en_US.UTF-8
 ENV LC_MESSAGES en_US.UTF-8
 
+# Disable noisy "Handling signal" log messages:
+# ENV GUNICORN_CMD_ARGS --log-level WARNING
+
 RUN set -ex \
     && buildDeps=' \
         freetds-dev \
@@ -80,4 +83,4 @@ EXPOSE 8080 5555 8793
 USER airflow
 WORKDIR ${AIRFLOW_USER_HOME}
 ENTRYPOINT ["/entrypoint.sh"]
-CMD ["webserver"] # set default arg for entrypoint
+CMD ["webserver"]

README.md

@@ -10,7 +10,7 @@ This repository contains **Dockerfile** of [apache-airflow](https://github.com/a
 
 ## Informations
 
-* Based on Python (3.7-slim-stretch) official Image [python:3.7-slim-stretch](https://hub.docker.com/_/python/) and uses the official [Postgres](https://hub.docker.com/_/postgres/) as backend and [Redis](https://hub.docker.com/_/redis/) as queue
+* Based on Python (3.7-slim-buster) official Image [python:3.7-slim-buster](https://hub.docker.com/_/python/) and uses the official [Postgres](https://hub.docker.com/_/postgres/) as backend and [Redis](https://hub.docker.com/_/redis/) as queue
 * Install [Docker](https://www.docker.com/)
 * Install [Docker Compose](https://docs.docker.com/compose/install/)
 * Following the Airflow release from [Python Package Index](https://pypi.python.org/pypi/apache-airflow)
@@ -67,7 +67,7 @@ For encrypted connection passwords (in Local or Celery Executor), you must have
 
     docker run puckel/docker-airflow python -c "from cryptography.fernet import Fernet; FERNET_KEY = Fernet.generate_key().decode(); print(FERNET_KEY)"
 
-## Configurating Airflow
+## Configuring Airflow
 
 It's possible to set any configuration value for Airflow from environment variables, which are used over values from the airflow.cfg.
 
@@ -122,6 +122,52 @@ You can also use this to run a bash shell or any other command in the same envir
     docker run --rm -ti puckel/docker-airflow bash
     docker run --rm -ti puckel/docker-airflow ipython
 
+# Simplified SQL database configuration using PostgreSQL
+
+If the executor type is set to anything else than *SequentialExecutor* you'll need an SQL database.
+Here is a list of PostgreSQL configuration variables and their default values. They're used to compute
+the `AIRFLOW__CORE__SQL_ALCHEMY_CONN` and `AIRFLOW__CELERY__RESULT_BACKEND` variables when needed for you
+if you don't provide them explicitly:
+
+| Variable            | Default value |  Role                |
+|---------------------|---------------|----------------------|
+| `POSTGRES_HOST`     | `postgres`    | Database server host |
+| `POSTGRES_PORT`     | `5432`        | Database server port |
+| `POSTGRES_USER`     | `airflow`     | Database user        |
+| `POSTGRES_PASSWORD` | `airflow`     | Database password    |
+| `POSTGRES_DB`       | `airflow`     | Database name        |
+| `POSTGRES_EXTRAS`   | empty         | Extras parameters    |
+
+You can also use those variables to adapt your compose file to match an existing PostgreSQL instance managed elsewhere.
+
+Please refer to the Airflow documentation to understand the use of extras parameters, for example in order to configure
+a connection that uses TLS encryption.
+
+Here's an important thing to consider:
+
+> When specifying the connection as URI (in AIRFLOW_CONN_* variable) you should specify it following the standard syntax of DB connections,
+> where extras are passed as parameters of the URI (note that all components of the URI should be URL-encoded).
+
+Therefore you must provide extras parameters URL-encoded, starting with a leading `?`. For example:
+
+    POSTGRES_EXTRAS="?sslmode=verify-full&sslrootcert=%2Fetc%2Fssl%2Fcerts%2Fca-certificates.crt"
+
+# Simplified Celery broker configuration using Redis
+
+If the executor type is set to *CeleryExecutor* you'll need a Celery broker. Here is a list of Redis configuration variables
+and their default values. They're used to compute the `AIRFLOW__CELERY__BROKER_URL` variable for you if you don't provide
+it explicitly:
+
+| Variable          | Default value | Role                           |
+|-------------------|---------------|--------------------------------|
+| `REDIS_PROTO`     | `redis://`    | Protocol                       |
+| `REDIS_HOST`      | `redis`       | Redis server host              |
+| `REDIS_PORT`      | `6379`        | Redis server port              |
+| `REDIS_PASSWORD`  | empty         | If Redis is password protected |
+| `REDIS_DBNUM`     | `1`           | Database number                |
+
+You can also use those variables to adapt your compose file to match an existing Redis instance managed elsewhere.
+
 # Wanna help?
 
-Fork, improve and PR. ;-)
+Fork, improve and PR.