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.

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

update docker-py to 7.1.0 #47092

Merged
merged 1 commit into from
May 28, 2024
Merged

update docker-py to 7.1.0 #47092

merged 1 commit into from
May 28, 2024

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jan 17, 2024

update docker-py to 7.1.0

full diff: docker/docker-py@7.0.0...7.1.0

- What I did

- How I did it

- How to verify it

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@vvoland
Copy link
Contributor

vvoland commented Mar 5, 2024

We should undraft this if we want to deprecate Container related fields in image inspect in v26: docker/cli#4893

@thaJeztah
Copy link
Member Author

Ah, yeah; I think we had skips for those set, or we don't?

Looking at docker/docker-py@2a5f354, perhaps we need to do another update there to update it to v25, and we could ask them to tag a new version (could be a "patch" or "minor" release; looks like it's mostly bug fixes, but also compatibility with newer API versions(?) so that could mean "minor" version update.

@vvoland
Copy link
Contributor

vvoland commented Mar 5, 2024

Hmm looks like we have the skips but they don't work? 🤔 they're only for the containerd integration.

At least #47430 shows related docker-py failures.

@thaJeztah
Copy link
Member Author

they're only for the containerd integration.

Ah, right, I guess we could still skip unconditionally. That said; not 100% against updating to "master"; mostly was trying to stay on tagged versions, but it's not critical

@thaJeztah thaJeztah changed the title update docker-py to current master update docker-py to current 7.1.0 May 24, 2024
@thaJeztah thaJeztah marked this pull request as ready for review May 24, 2024 12:58
@thaJeztah thaJeztah requested a review from tianon as a code owner May 24, 2024 12:58
@thaJeztah thaJeztah changed the title update docker-py to current 7.1.0 update docker-py to 7.1.0 May 25, 2024
@thaJeztah thaJeztah added this to the 27.0.0 milestone May 27, 2024
# shellcheck disable=SC2086
exec docker build ${build_opts} -t "${docker_py_image}" -f tests/Dockerfile "https://github.com/docker/docker-py.git#${DOCKER_PY_COMMIT}"
exec docker build ${build_opts} -t "${docker_py_image}" --build-arg VERSION="${DOCKER_PY_COMMIT}" -f tests/Dockerfile "https://github.com/docker/docker-py.git#${DOCKER_PY_COMMIT}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no, yet another env var whose value then gets used for SETUPTOOLS_SCM_PRETEND_VERSION ? 🙈

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup; looks like it was there before, but at the time it had a default value in the Dockerfile (99.0.0?).

That default was removed, so now it must be passed. We should fix that, because I think we should try to make any Dockerfile have sensible defaults, so that they work without passing build-args (only in exceptional cases where a build-arg MUST be set).

full diff: docker/docker-py@7.0.0...7.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

Rebased, and updated the TODO's to include a link to docker/docker-py#3267, which should allow removing the VERSION build-arg.

@thaJeztah thaJeztah merged commit 4e07c49 into moby:master May 28, 2024
126 checks passed
@thaJeztah thaJeztah deleted the bump_docker_py branch May 28, 2024 18:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unskip docker-py commit tests
4 participants