diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1752145318002..fb1190468628d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -340,7 +340,7 @@ jobs: runs-on: ubuntu-20.04 needs: [build-info, ci-images] env: - INSTALL_AIRFLOW_VERSION: "1.10.12" + INSTALL_AIRFLOW_VERSION: "1.10.13" PYTHON_MAJOR_MINOR_VERSION: ${{needs.build-info.outputs.defaultPythonVersion}} BACKPORT_PACKAGES: "true" VERSION_SUFFIX_FOR_SVN: "rc1" diff --git a/BREEZE.rst b/BREEZE.rst index a0eea98e97b2f..deb235d1e9d9e 100644 --- a/BREEZE.rst +++ b/BREEZE.rst @@ -1206,8 +1206,8 @@ This is the current syntax for `./breeze <./breeze>`_: If specified, installs Airflow directly from PIP released version. This happens at image building time in production image and at container entering time for CI image. One of: - 1.10.12 1.10.11 1.10.10 1.10.9 1.10.8 1.10.7 1.10.6 1.10.5 1.10.4 1.10.3 1.10.2 - wheel + 1.10.13 1.10.12 1.10.11 1.10.10 1.10.9 1.10.8 1.10.7 1.10.6 1.10.5 1.10.4 1.10.3 + 1.10.2 wheel When 'wheel' is used, Airflow is installed from /dist/apache_airflow-*.whl file. @@ -2246,8 +2246,8 @@ This is the current syntax for `./breeze <./breeze>`_: If specified, installs Airflow directly from PIP released version. This happens at image building time in production image and at container entering time for CI image. One of: - 1.10.12 1.10.11 1.10.10 1.10.9 1.10.8 1.10.7 1.10.6 1.10.5 1.10.4 1.10.3 1.10.2 - wheel + 1.10.13 1.10.12 1.10.11 1.10.10 1.10.9 1.10.8 1.10.7 1.10.6 1.10.5 1.10.4 1.10.3 + 1.10.2 wheel When 'wheel' is used, Airflow is installed from /dist/apache_airflow-*.whl file. diff --git a/IMAGES.rst b/IMAGES.rst index fad29a69dafe8..6672536c28424 100644 --- a/IMAGES.rst +++ b/IMAGES.rst @@ -39,7 +39,7 @@ The images are named as follows: where: -* ``BRANCH_OR_TAG`` - branch or tag used when creating the image. Examples: ``master``, ``v1-10-test``, ``1.10.12`` +* ``BRANCH_OR_TAG`` - branch or tag used when creating the image. Examples: ``master``, ``v1-10-test``, ``1.10.13`` The ``master`` and ``v1-10-test`` labels are built from branches so they change over time. The ``1.10.*`` and in the future ``2.*`` labels are build from git tags and they are "fixed" once built. * ``PYTHON_MAJOR_MINOR_VERSION`` - version of python used to build the image. Examples: ``3.5``, ``3.7`` @@ -115,15 +115,15 @@ parameter to Breeze: .. code-block:: bash ./breeze build-image --python 3.7 --additional-extras=presto \ - --production-image --install-airflow-version=1.10.12 + --production-image --install-airflow-version=1.10.13 This will build the image using command similar to: .. code-block:: bash pip install \ - apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv,presto]==1.10.12 \ - --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.12/constraints-3.6.txt" + apache-airflow[async,aws,azure,celery,dask,elasticsearch,gcp,kubernetes,mysql,postgres,redis,slack,ssh,statsd,virtualenv,presto]==1.10.13 \ + --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-1.10.13/constraints-3.6.txt" You can also build production images from specific Git version via providing ``--install-airflow-reference`` parameter to Breeze (this time constraints are taken from the ``constraints-master`` branch which is the @@ -210,8 +210,8 @@ For example: apache/airflow:master-python3.6 - production "latest" image from current master apache/airflow:master-python3.6-ci - CI "latest" image from current master apache/airflow:v1-10-test-python2.7-ci - CI "latest" image from current v1-10-test branch - apache/airflow:1.10.12-python3.6 - production image for 1.10.12 release - apache/airflow:1.10.12-1-python3.6 - production image for 1.10.12 with some patches applied + apache/airflow:1.10.13-python3.6 - production image for 1.10.13 release + apache/airflow:1.10.13-1-python3.6 - production image for 1.10.13 with some patches applied You can see DockerHub images at ``_ @@ -292,7 +292,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_INSTALL_VERSION="==1.10.12" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.13" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -308,7 +308,7 @@ the same image can be built using ``breeze`` (it supports auto-completion of the .. code-block:: bash ./breeze build-image -f Dockerfile.ci \ - --production-image --python 3.7 --install-airflow-version=1.10.12 \ + --production-image --python 3.7 --install-airflow-version=1.10.13 \ --additional-extras=jdbc --additional-python-deps="pandas" \ --additional-dev-apt-deps="gcc g++" --additional-runtime-apt-deps="default-jre-headless" You can build the default production image with standard ``docker build`` command but they will only build @@ -326,7 +326,7 @@ based on example in `this comment `_ chapter below. Here just a few examples are presented which should give you general understanding of what you can customize. -This builds the production image in version 3.7 with additional airflow extras from 1.10.12 Pypi package and +This builds the production image in version 3.7 with additional airflow extras from 1.10.13 PyPI package and additional apt dev and runtime dependencies. .. code-block:: bash @@ -134,7 +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_INSTALL_VERSION="==1.10.12" \ + --build-arg AIRFLOW_INSTALL_VERSION="==1.10.13" \ --build-arg AIRFLOW_CONSTRAINTS_REFERENCE="constraints-1-10" \ --build-arg AIRFLOW_SOURCES_FROM="empty" \ --build-arg AIRFLOW_SOURCES_TO="/empty" \ @@ -150,7 +150,7 @@ the same image can be built using ``breeze`` (it supports auto-completion of the .. code-block:: bash ./breeze build-image \ - --production-image --python 3.7 --install-airflow-version=1.10.12 \ + --production-image --python 3.7 --install-airflow-version=1.10.13 \ --additional-extras=jdbc --additional-python-deps="pandas" \ --additional-dev-apt-deps="gcc g++" --additional-runtime-apt-deps="default-jre-headless" @@ -166,7 +166,7 @@ based on example in `this comment