You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by jh...@apache.org on 2021/08/11 23:07:41 UTC
[airflow] 03/11: Optimizes structure of the Dockerfiles and use
latest tools (#17418)
This is an automated email from the ASF dual-hosted git repository.
jhtimmins pushed a commit to branch v2-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 70629cad94ff26ace19f9a817884e171e626898b
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Wed Aug 4 23:32:12 2021 +0200
Optimizes structure of the Dockerfiles and use latest tools (#17418)
* Remove CONTINUE_ON_PIP_CHECK_FAILURE parameter
This parameter was useful when upgrading new dependencies,
however it is going to be replaced with better approach in the
upcoming image convention change.
* Optimizes structure of the Dockerfiles and use latest tools
This PR optimizes the structure of Dockerfile by moving some
expensive operations before the COPY sources so that
rebuilding image when only few sources change is much faster.
At the same time, we upgrade PIP and HELM chart used to latest
versions and clean-up some parameter inconsistencies.
(cherry picked from commit 94b03f6f43277e7332c25fdc63aedfde605f9773)
---
BREEZE.rst | 6 ------
breeze | 3 ---
scripts/ci/libraries/_build_images.sh | 17 -----------------
3 files changed, 26 deletions(-)
diff --git a/BREEZE.rst b/BREEZE.rst
index 79f27b4..468709b 100644
--- a/BREEZE.rst
+++ b/BREEZE.rst
@@ -1279,9 +1279,6 @@ This is the current syntax for `./breeze <./breeze>`_:
--upgrade-to-newer-dependencies
Upgrades PIP packages to latest versions available without looking at the constraints.
- --continue-on-pip-check-failure
- Continue even if 'pip check' fails.
-
-I, --production-image
Use production image for entering the environment and builds (not for tests).
@@ -2435,9 +2432,6 @@ This is the current syntax for `./breeze <./breeze>`_:
--upgrade-to-newer-dependencies
Upgrades PIP packages to latest versions available without looking at the constraints.
- --continue-on-pip-check-failure
- Continue even if 'pip check' fails.
-
****************************************************************************************************
Use different Airflow version at runtime in CI image
diff --git a/breeze b/breeze
index 2fe1458..b8387f3 100755
--- a/breeze
+++ b/breeze
@@ -2389,9 +2389,6 @@ ${FORMATTED_INSTALLATION_METHOD}
--upgrade-to-newer-dependencies
Upgrades PIP packages to latest versions available without looking at the constraints.
---continue-on-pip-check-failure
- Continue even if 'pip check' fails.
-
"
}
diff --git a/scripts/ci/libraries/_build_images.sh b/scripts/ci/libraries/_build_images.sh
index dfbfe1a..551674f 100644
--- a/scripts/ci/libraries/_build_images.sh
+++ b/scripts/ci/libraries/_build_images.sh
@@ -1034,23 +1034,6 @@ ${COLOR_BLUE}
./breeze build-image --production-image --upgrade-to-newer-dependencies --python 3.6
${COLOR_RESET}
-* If you want to build the image regardless if 'pip check' fails for it, you can add
- --continue-on-pip-check-failure flag and enter the image and inspect dependencies.
-
-CI image:
-
-${COLOR_BLUE}
- ./breeze build-image --upgrade-to-newer-dependencies --python 3.6 --continue-on-pip-check-failure
- docker run -it apache/airflow:main-3.6-ci bash
-${COLOR_RESET}
-
-Production image:
-
-${COLOR_BLUE}
- ./breeze build-image --production-image --upgrade-to-newer-dependencies --python 3.6 --continue-on-pip-check-failure
- docker run -it apache/airflow:main-3.6 bash
-${COLOR_RESET}
-
* You will see error messages there telling which requirements are conflicting and which packages caused the
conflict. Add the limitation that caused the conflict to EAGER_UPGRADE_ADDITIONAL_REQUIREMENTS
variable in Dockerfile.ci. Note that the limitations might be different for Dockerfile.ci and Dockerfile