This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-2-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit e31ccc216ba89c3672a50f7689f748a14c82c643 Author: Jarek Potiuk <[email protected]> AuthorDate: Thu Jan 20 13:09:28 2022 +0100 Update base python image to be Python 3.7 by default (#20978) Default base python image should be set to Python 3.7 as we dropped Python 3.6 support. (cherry picked from commit 7ee4295dd3f7dba4fcd763286c7823bb1707fe99) --- Dockerfile | 2 +- Dockerfile.ci | 4 ++-- IMAGES.rst | 2 +- docs/docker-stack/build-arg-ref.rst | 2 +- .../docker-examples/customizing/add-build-essential-custom.sh | 2 +- .../docker-stack/docker-examples/customizing/pypi-dev-runtime-deps.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 778b21b..c775cf8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ ARG AIRFLOW_HOME=/opt/airflow ARG AIRFLOW_UID="50000" ARG AIRFLOW_USER_HOME_DIR=/home/airflow -ARG PYTHON_BASE_IMAGE="python:3.6-slim-buster" +ARG PYTHON_BASE_IMAGE="python:3.7-slim-buster" ARG AIRFLOW_PIP_VERSION=21.3.1 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"; diff --git a/Dockerfile.ci b/Dockerfile.ci index fd6e3a8..7a206dd 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -15,14 +15,14 @@ # # WARNING: THIS DOCKERFILE IS NOT INTENDED FOR PRODUCTION USE OR DEPLOYMENT. # -ARG PYTHON_BASE_IMAGE="python:3.6-slim-buster" +ARG PYTHON_BASE_IMAGE="python:3.7-slim-buster" FROM ${PYTHON_BASE_IMAGE} as main # Nolog bash flag is currently ignored - but you can replace it with other flags (for example # xtrace - to show commands executed) SHELL ["/bin/bash", "-o", "pipefail", "-o", "errexit", "-o", "nounset", "-o", "nolog", "-c"] -ARG PYTHON_BASE_IMAGE="python:3.6-slim-buster" +ARG PYTHON_BASE_IMAGE="python:3.7-slim-buster" ARG AIRFLOW_VERSION="2.2.0.dev0" ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"; diff --git a/IMAGES.rst b/IMAGES.rst index 48108ca..9fafc94 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -372,7 +372,7 @@ The following build arguments (``--build-arg`` in docker build command) can be u +------------------------------------------+------------------------------------------+------------------------------------------+ | Build argument | Default value | Description | +==========================================+==========================================+==========================================+ -| ``PYTHON_BASE_IMAGE`` | ``python:3.6-slim-buster`` | Base Python image | +| ``PYTHON_BASE_IMAGE`` | ``python:3.7-slim-buster`` | Base Python image | +------------------------------------------+------------------------------------------+------------------------------------------+ | ``PYTHON_MAJOR_MINOR_VERSION`` | ``3.6`` | major/minor version of Python (should | | | | match base image) | diff --git a/docs/docker-stack/build-arg-ref.rst b/docs/docker-stack/build-arg-ref.rst index 1c298f1..701ceda 100644 --- a/docs/docker-stack/build-arg-ref.rst +++ b/docs/docker-stack/build-arg-ref.rst @@ -30,7 +30,7 @@ Those are the most common arguments that you use when you want to build a custom +------------------------------------------+------------------------------------------+---------------------------------------------+ | Build argument | Default value | Description | +==========================================+==========================================+=============================================+ -| ``PYTHON_BASE_IMAGE`` | ``python:3.6-slim-buster`` | Base python image. | +| ``PYTHON_BASE_IMAGE`` | ``python:3.7-slim-buster`` | Base python image. | +------------------------------------------+------------------------------------------+---------------------------------------------+ | ``AIRFLOW_VERSION`` | :subst-code:`|airflow-version|` | version of Airflow. | +------------------------------------------+------------------------------------------+---------------------------------------------+ diff --git a/docs/docker-stack/docker-examples/customizing/add-build-essential-custom.sh b/docs/docker-stack/docker-examples/customizing/add-build-essential-custom.sh index c6ffd20..81ad1a8 100755 --- a/docs/docker-stack/docker-examples/customizing/add-build-essential-custom.sh +++ b/docs/docker-stack/docker-examples/customizing/add-build-essential-custom.sh @@ -26,7 +26,7 @@ export AIRFLOW_VERSION=2.2.2 docker build . \ --pull \ - --build-arg PYTHON_BASE_IMAGE="python:3.6-slim-buster" \ + --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg AIRFLOW_VERSION="${AIRFLOW_VERSION}" \ --build-arg ADDITIONAL_PYTHON_DEPS="mpi4py" \ --build-arg ADDITIONAL_DEV_APT_DEPS="libopenmpi-dev" \ diff --git a/docs/docker-stack/docker-examples/customizing/pypi-dev-runtime-deps.sh b/docs/docker-stack/docker-examples/customizing/pypi-dev-runtime-deps.sh index d9ac1e9..d8f9de0 100755 --- a/docs/docker-stack/docker-examples/customizing/pypi-dev-runtime-deps.sh +++ b/docs/docker-stack/docker-examples/customizing/pypi-dev-runtime-deps.sh @@ -26,7 +26,7 @@ export AIRFLOW_VERSION=2.2.2 docker build . \ --pull \ - --build-arg PYTHON_BASE_IMAGE="python:3.6-slim-buster" \ + --build-arg PYTHON_BASE_IMAGE="python:3.7-slim-buster" \ --build-arg AIRFLOW_VERSION="${AIRFLOW_VERSION}" \ --build-arg ADDITIONAL_AIRFLOW_EXTRAS="jdbc" \ --build-arg ADDITIONAL_PYTHON_DEPS="pandas" \
