This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit a8062298f64a80190361098a4f97f55a2ed914bd Author: Jarek Potiuk <[email protected]> AuthorDate: Mon Dec 7 16:08:55 2020 +0100 Clarifies version args for installing 1.10 in Docker (#12875) This change clarifies that AIRFLOW_VERSION should be passed together with AIRFLOW_INSTALL_VERSION when the Docker image is build. Fixes #8612 (cherry picked from commit 1dcef78b12ac4746345f4630966e0dc4e32e41da) --- IMAGES.rst | 2 ++ docs/production-deployment.rst | 10 +++++++++- scripts/ci/libraries/_build_images.sh | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/IMAGES.rst b/IMAGES.rst index 6a04428..513f8cf 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -300,6 +300,7 @@ additional apt dev and runtime dependencies. --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ @@ -334,6 +335,7 @@ based on example in `this comment <https://github.com/apache/airflow/issues/8605 --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ diff --git a/docs/production-deployment.rst b/docs/production-deployment.rst index 7964b34..335e713 100644 --- a/docs/production-deployment.rst +++ b/docs/production-deployment.rst @@ -134,6 +134,7 @@ additional apt dev and runtime dependencies. --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ @@ -166,6 +167,7 @@ based on example in `this comment <https://github.com/apache/airflow/issues/8605 --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ @@ -245,6 +247,7 @@ or --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ @@ -516,7 +519,9 @@ production image. There are three types of build: | ``AIRFLOW_INSTALL_VERSION`` | Optional - might be used for | | | package installation case to | | | set Airflow version for example | -| | "==1.10.14" | +| | "==1.10.14". Remember to also | +| | Set ``AIRFLOW_VERSION`` | +| | when you use it. | +-----------------------------------+-----------------------------------+ | ``AIRFLOW_CONSTRAINTS_REFERENCE`` | reference (branch or tag) from | | | GitHub where constraints file | @@ -583,6 +588,7 @@ of v1-10-test branch. --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_BRANCH="v1-10-test" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.14" \ @@ -598,6 +604,7 @@ additional python dependencies and pre-installed pip dependencies from 1.10.14 t --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_BRANCH="v1-10-test" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1.10.14" \ @@ -615,6 +622,7 @@ additional apt dev and runtime dependencies. --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_VERSION="1.10.14" \ --build-arg AIRFLOW_INSTALL_VERSION="==1.10.14" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ diff --git a/scripts/ci/libraries/_build_images.sh b/scripts/ci/libraries/_build_images.sh index 17889ce..d054f15 100644 --- a/scripts/ci/libraries/_build_images.sh +++ b/scripts/ci/libraries/_build_images.sh @@ -647,6 +647,7 @@ function build_images::prepare_prod_build() { EXTRA_DOCKER_PROD_BUILD_FLAGS=( "--build-arg" "AIRFLOW_INSTALL_SOURCES=apache-airflow" "--build-arg" "AIRFLOW_INSTALL_VERSION===${INSTALL_AIRFLOW_VERSION}" + "--build-arg" "AIRFLOW_VERSION=${INSTALL_AIRFLOW_VERSION}" ) export AIRFLOW_VERSION="${INSTALL_AIRFLOW_VERSION}" if [[ ${AIRFLOW_VERSION} == "1.10.2" || ${AIRFLOW_VERSION} == "1.10.1" ]]; then
