Update docker client library to latest #3557
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
this is to fix a dependency in the windows docker library which depends on this file and it's Build() function: https://github.com/microsoft/hcsshim/blob/v0.8.15/osversion/osversion_windows.go without bumping this we get windows build failures like this: + go build -ldflags ' -s' -o out/amazon-ecs-agent.exe ./agent/ Error: agent/vendor/github.com/docker/docker/pkg/system/lcow.go:21:31: undefined: osversion.Build make: *** [Makefile:60: xplatform-build] Error 2
Passing nil to ContainerCreate means that the client library will ignore this arg and not pass it in the list of arguments it submits to the docker API. see https://github.com/moby/moby/blob/4c0d75bc8e8311407040ae7c930f5a2c2c9c03aa/client/container_create.go#L49 We don't want to pass the platform arg because we are not using it and this is the simplest way to ensure continued support of older docker versions.
sparrc
force-pushed
the
update-docker-library-v2
branch
from
adf1973 to
1692d11
Compare
sparrc
changed the title
sparrc
commented
Feb 2, 2023
| @@ -574,7 +574,7 @@ func (dg *dockerGoClient) createContainer(ctx context.Context, | |||
| return DockerContainerMetadata{Error: CannotGetDockerClientError{version: dg.version, err: err}} | |||
| } | |||
|
|
|||
| dockerContainer, err := client.ContainerCreate(ctx, config, hostConfig, &network.NetworkingConfig{}, name) | |||
| dockerContainer, err := client.ContainerCreate(ctx, config, hostConfig, &network.NetworkingConfig{}, nil, name) | |||
There was a problem hiding this comment.
Passing nil to ContainerCreate means that the client library will ignore
this arg and not pass it in the list of arguments it submits to the
docker API.
We don't want to pass the platform arg because we are not using it and
this is the simplest way to ensure continued support of older docker
versions.
sparrc
commented
Feb 2, 2023
| @@ -141,7 +141,7 @@ VERBOSE=-v -cover | |||
| # provide false positives when running integ tests, so we err on the side of | |||
| # caution. See `go help test` | |||
| # unit tests include the coverage profile | |||
| GOTEST=${GO_EXECUTABLE} test -count=1 ${VERBOSE} | |||
| GOTEST=${GO_EXECUTABLE} test -count=1 | |||
There was a problem hiding this comment.
unrelated fix for test-silent make target
mythri-garaga
approved these changes
Feb 2, 2023
mye956
approved these changes
Feb 3, 2023
|
closing in favor of #3598 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Ran the following go module update commands:
The microsoft library was updated to fix a build issue in the latest docker library with the version of hcsshim we were using. See commit message:
Testing
verified long functional tests ran on AL2 platform
manually verified agent builds, runs, and runs tasks on an AMI with an older docker version (19.03.13)
Description for the changelog
Enhancement: update docker client library to latest
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.