From 99a4d3e59a56dff7a2125f1cf3b7988b0b404956 Mon Sep 17 00:00:00 2001 From: Elad Kalif <45845474+eladkal@users.noreply.github.com> Date: Mon, 27 May 2024 00:06:01 +0300 Subject: [PATCH] Bump docker version to 7.1.0 (#39839) * Bump docker and requests versions * fixup! Bump docker and requests versions --------- Co-authored-by: Jarek Potiuk (cherry picked from commit aec3f802783c42f8544c631d08e3b226d41cdc39) --- Dockerfile.ci | 5 +---- airflow/providers/docker/provider.yaml | 9 ++------- generated/provider_dependencies.json | 7 +++---- scripts/docker/entrypoint_ci.sh | 5 +---- 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/Dockerfile.ci b/Dockerfile.ci index ef6787b6ff922..bd2ce0871da2d 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -1005,12 +1005,9 @@ function check_boto_upgrade() { ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs || true # We need to include oss2 as dependency as otherwise jmespath will be bumped and it will not pass # the pip check test, Similarly gcloud-aio-auth limit is needed to be included as it bumps cryptography - # Also until docker-py compatibility with requests 2.32 is fixed we need to limit requests version - # Should be removed after https://github.com/docker/docker-py/issues/3256 together with removal of similar - # limitation in providers/docker/pyproject.toml # shellcheck disable=SC2086 ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \ - "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" "requests<2.32.0" + "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" pip check } diff --git a/airflow/providers/docker/provider.yaml b/airflow/providers/docker/provider.yaml index a0732655ba31d..7c79bf978a444 100644 --- a/airflow/providers/docker/provider.yaml +++ b/airflow/providers/docker/provider.yaml @@ -64,14 +64,9 @@ versions: - 1.0.0 dependencies: - - apache-airflow>=2.6.0 - - docker>=6 + - apache-airflow>=2.7.0 + - docker>=7.1.0 - python-dotenv>=0.21.0 - # requests 2.32.0 has an incompatibility with python lib docker - # https://github.com/psf/requests/issues/6707 and https://github.com/docker/docker-py/issues/3256 - # once resolved remove this dependency and bump docker-py version - # !!!!! Make sure to also remove it from the scripts/docker/entrypoint_ci.sh !!!!! - - requests>=2.27.0,<2.32.0 integrations: - integration-name: Docker diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 3091cc9c6865b..3ea373c843115 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -430,10 +430,9 @@ }, "docker": { "deps": [ - "apache-airflow>=2.6.0", - "docker>=6", - "python-dotenv>=0.21.0", - "requests>=2.27.0,<2.32.0" + "apache-airflow>=2.7.0", + "docker>=7.1.0", + "python-dotenv>=0.21.0" ], "devel-deps": [], "cross-providers-deps": [], diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh index 35c4f1f197e54..0e444291eddcd 100755 --- a/scripts/docker/entrypoint_ci.sh +++ b/scripts/docker/entrypoint_ci.sh @@ -225,12 +225,9 @@ function check_boto_upgrade() { ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs || true # We need to include oss2 as dependency as otherwise jmespath will be bumped and it will not pass # the pip check test, Similarly gcloud-aio-auth limit is needed to be included as it bumps cryptography - # Also until docker-py compatibility with requests 2.32 is fixed we need to limit requests version - # Should be removed after https://github.com/docker/docker-py/issues/3256 together with removal of similar - # limitation in providers/docker/pyproject.toml # shellcheck disable=SC2086 ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \ - "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" "requests<2.32.0" + "oss2>=2.14.0" "gcloud-aio-auth>=4.0.0,<5.0.0" pip check }