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

docker: set platform when creating containers #16886

Merged
merged 4 commits into from
Sep 16, 2022

Conversation

tdyas
Copy link
Contributor

@tdyas tdyas commented Sep 15, 2022

Update bollard and make use of new ability to set platform upon container creation.

For tests, the busybox image is only available for Linux and not macOS. Thus on macOS the tests fail since no macOS version of busybox image is available. Solve by pinning the platform used for tests to Linux. On Linux this is fine since same OS. On macOS, this works due to macOS Docker support for running Linux containers.

Tom Dyas added 2 commits September 15, 2022 11:31
[ci skip-build-wheels]
[ci skip-build-wheels]
@tdyas tdyas added the category:internal CI, fixes for not-yet-released features, etc. label Sep 15, 2022
@@ -9,7 +9,7 @@ publish = false
async-stream = "0.3"
async-trait = "0.1"
async-lock = "2.5"
bollard = { git = "https://github.com/fussybeaver/bollard.git", rev = "2e10fe31076a6e298697fc6e31fa3676b7498b6c" }
bollard = { git = "https://github.com/fussybeaver/bollard.git", rev = "2d66d11b44aeff0373ece3d64a44b243e5152973" }
Copy link
Member

Choose a reason for hiding this comment

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

A comment explaining which release/PRs we're waiting for would be helpful.

@tdyas
Copy link
Contributor Author

tdyas commented Sep 15, 2022

@stuhood: This platform API is only available in Docker API v1.41 and higher. We should probably also have this code check the Docker daemon's version and error if it is less than v1.41. Do you concur?

@Eric-Arellano
Copy link
Contributor

This platform API is only available in Docker API v1.41 and higher. We should probably also have this code check the Docker daemon's version and error if it is less than v1.41. Do you concur?

I think so. Especially because M1s are so popular now, I think it's common users will need to set the platform.

[ci skip-build-wheels]
[ci skip-build-wheels]
@tdyas tdyas merged commit ba75665 into pantsbuild:main Sep 16, 2022
@tdyas tdyas deleted the docker_set_exec_platform branch September 16, 2022 02:45
asherf added a commit to asherf/pants that referenced this pull request Apr 21, 2023
The commit is now part of the release:
fussybeaver/bollard@2d66d11
more context: pantsbuild#16886
stuhood pushed a commit that referenced this pull request Apr 21, 2023
The commit is now part of the release:

fussybeaver/bollard@2d66d11
more context: #16886
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:internal CI, fixes for not-yet-released features, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants