Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump docker version to 7.1.0 #39839

Merged
merged 2 commits into from
May 26, 2024
Merged

Bump docker version to 7.1.0 #39839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31091ac
Bump docker and requests versions
eladkal May 26, 2024
aba3cce
fixup! Bump docker and requests versions
potiuk May 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,12 +1007,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
}

Expand Down
7 changes: 1 addition & 6 deletions airflow/providers/docker/provider.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,8 @@ versions:

dependencies:
- apache-airflow>=2.7.0
- docker>=6
- 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
Expand Down
5 changes: 2 additions & 3 deletions generated/provider_dependencies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,9 +479,8 @@
"docker": {
"deps": [
"apache-airflow>=2.7.0",
"docker>=6",
"python-dotenv>=0.21.0",
"requests>=2.27.0,<2.32.0"
"docker>=7.1.0",
"python-dotenv>=0.21.0"
],
"devel-deps": [],
"plugins": [],
Expand Down
5 changes: 1 addition & 4 deletions scripts/docker/entrypoint_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,12 +227,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
}

Expand Down