From c2af1ef1300dece36711f75e53e7d5478987a109 Mon Sep 17 00:00:00 2001 From: Fabian Witt Date: Wed, 27 May 2020 10:56:09 +0200 Subject: [PATCH 1/3] Add build-arg ADDITIONAL_AIRFLOW_EXTRAS --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fdf60cff7ef7f..ed4114ed87a86 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,6 +35,7 @@ # ARG AIRFLOW_VERSION="2.0.0.dev0" ARG AIRFLOW_EXTRAS="async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv" +ARG ADDITIONAL_AIRFLOW_EXTRAS="" ARG AIRFLOW_HOME=/opt/airflow ARG AIRFLOW_UID="50000" @@ -166,7 +167,8 @@ ARG AIRFLOW_VERSION ENV AIRFLOW_VERSION=${AIRFLOW_VERSION} ARG AIRFLOW_EXTRAS -ENV AIRFLOW_EXTRAS=${AIRFLOW_EXTRAS} +ARG ADDITIONAL_AIRFLOW_EXTRAS +ENV AIRFLOW_EXTRAS=${AIRFLOW_EXTRAS}${ADDITIONAL_AIRFLOW_EXTRAS:+,}${ADDITIONAL_AIRFLOW_EXTRAS} ARG AIRFLOW_INSTALL_SOURCES="." ENV AIRFLOW_INSTALL_SOURCES=${AIRFLOW_INSTALL_SOURCES} From 2900d66db51550524acff9111cc5e2364218cad2 Mon Sep 17 00:00:00 2001 From: Fabian Witt Date: Wed, 27 May 2020 10:56:22 +0200 Subject: [PATCH 2/3] Add ADDITIONAL_AIRFLOW_EXTRAS example and description --- IMAGES.rst | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/IMAGES.rst b/IMAGES.rst index 99582141eba14..1796c5aaa98ad 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -257,6 +257,9 @@ The following build arguments (``--build-arg`` in docker build command) can be u | ``AIRFLOW_EXTRAS`` | (see Dockerfile) | Default extras with which airflow is | | | | installed | +------------------------------------------+------------------------------------------+------------------------------------------+ +| ``ADDITIONAL_AIRFLOW_EXTRAS`` | (see Dockerfile) | additional extras with which airflow is | +| | | installed | ++------------------------------------------+------------------------------------------+------------------------------------------+ | ``AIRFLOW_HOME`` | ``/opt/airflow`` | Airflow’s HOME (that’s where logs and | | | | sqlite databases are stored) | +------------------------------------------+------------------------------------------+------------------------------------------+ @@ -365,6 +368,21 @@ requirements taken from v1-10-test branch in Github. --build-arg AIRFLOW_SOURCES_FROM="entrypoint.sh" \ --build-arg AIRFLOW_SOURCES_TO="/entrypoint" +This builds the production image in version 3.7 with additional airflow extras from 1.10.10 Pypi package. + +.. code-block:: + + docker build . \ + --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ + --build-arg PYTHON_MAJOR_MINOR_VERSION=3.7 \ + --build-arg AIRFLOW_INSTALL_SOURCES="apache-airflow" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.10" \ + --build-arg CONSTRAINT_REQUIREMENTS="https://raw.githubusercontent.com/apache/airflow/1.10.10/requirements/requirements-python3.7.txt" \ + --build-arg ENTRYPOINT_FILE="https://raw.githubusercontent.com/apache/airflow/1.10.10/entrypoint.sh" \ + --build-arg AIRFLOW_SOURCES_FROM="entrypoint.sh" \ + --build-arg AIRFLOW_SOURCES_TO="/entrypoint" \ + --build-arg ADDITIONAL_AIRFLOW_EXTRAS="mssql,hdfs" + Image manifests --------------- From fd9afa49b6ce1c06a050252d00d1d3eb0de11e77 Mon Sep 17 00:00:00 2001 From: Fabian Witt Date: Wed, 27 May 2020 12:51:17 +0200 Subject: [PATCH 3/3] fixed rebase bugs --- IMAGES.rst | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/IMAGES.rst b/IMAGES.rst index 354876bc5e1bc..750f88950c4e9 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -257,13 +257,11 @@ The following build arguments (``--build-arg`` in docker build command) can be u | ``AIRFLOW_EXTRAS`` | (see Dockerfile) | Default extras with which airflow is | | | | installed | +------------------------------------------+------------------------------------------+------------------------------------------+ -<<<<<<< HEAD -| ``ADDITIONAL_AIRFLOW_EXTRAS`` | (see Dockerfile) | additional extras with which airflow is | +| ``ADDITIONAL_AIRFLOW_EXTRAS`` | (see Dockerfile) | Additional extras with which airflow is | | | | installed | -======= ++------------------------------------------+------------------------------------------+------------------------------------------+ | ``ADDITIONAL_PYTHON_DEPS`` | (see Dockerfile) | Optional python packages to extend | | | | the image with some extra dependencies | ->>>>>>> 6fc555d0bc86fd752ac5162e4730d309c5828011 +------------------------------------------+------------------------------------------+------------------------------------------+ | ``AIRFLOW_HOME`` | ``/opt/airflow`` | Airflow’s HOME (that’s where logs and | | | | sqlite databases are stored) | @@ -373,7 +371,7 @@ requirements taken from v1-10-test branch in Github. --build-arg AIRFLOW_SOURCES_FROM="entrypoint.sh" \ --build-arg AIRFLOW_SOURCES_TO="/entrypoint" -This builds the production image in version 3.7 with dditional airflow extras from 1.10.10 Pypi package and +This builds the production image in version 3.7 with additional airflow extras from 1.10.10 Pypi package and additional python dependencies. .. code-block::