Uh oh!
There was an error while loading. Please reload this page.
[24.0 backport] assorted dockerfile and test updates - #4587
Merged
Conversation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit af05a68) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
We were depending on alpine's package repository to install compose, but for debian we used compose's GitHub releases. Depending on distro packages means that we don't know when updates will happen, and versions may diverge because of that; for example, alpine 3.18 updated to compose v2; On alpine 3.17: make -f docker.Makefile build-e2e-image docker run --rm docker-cli-e2e docker-compose --version docker-compose version 1.29.2, build unknown On alpine 3.18: make -f docker.Makefile build-e2e-image docker run --rm docker-cli-e2e docker-compose --version Docker Compose version v2.17.3 This caused our e2e script to fail, as it made assumptions about the name format created by compose, which changed from underscores to hyphens in v2; Container cliendtoendsuite-engine-1 Running Error: No such object: cliendtoendsuite_engine_1 This patch: - updates the Dockerfile to install compose from the compose-bin image - adjusts the e2e script for the new naming scheme format - removes the version field from the compose-files used in e2e, as they are no longer used by compose. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9e424af) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
It's not needed to build these binaries. The Dockerfile.dev image already has CGO_ENABLED=0 as default in the golang image, so does not need updates. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit f07e7e1) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This may find its way into the official images, but until it does, let's make sure we don't get unexpected updates of go. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit e9759ce) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
On Go 1.18 since a5ebe22, we get: # github.com/docker/docker-credential-helpers/client vendor/github.com/docker/docker-credential-helpers/client/command.go:34:39: programCmd.Environ undefined (type *exec.Cmd has no field or method Environ) note: module requires Go 1.19 # github.com/docker/cli/cli/connhelper/commandconn cli/connhelper/commandconn/commandconn.go:71:22: undefined: atomic.Bool cli/connhelper/commandconn/commandconn.go:76:22: undefined: atomic.Bool cli/connhelper/commandconn/commandconn.go:77:22: undefined: atomic.Bool cli/connhelper/commandconn/commandconn.go:78:22: undefined: atomic.Bool These go away when building against 1.19+. Signed-off-by: Tianon Gravi <admwiggin@gmail.com> (cherry picked from commit 0f59f04) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
codecov-commenter
commented
Sep 29, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@## 24.0 #4587 +/- ##
=======================================
Coverage 59.58% 59.58% =======================================
Files 288 288 Lines 24817 24817 =======================================
Hits 14786 14786 Misses 9145 9145 Partials 886 886 |
vvoland
approved these changes
Oct 13, 2023
neersighted
approved these changes
Oct 13, 2023
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
We decided to not (yet) update the 24.0 branch to go1.21, so removing these from #4583, but these should be safe to backport already.
backport of:
- A picture of a cute animal (not mandatory but encouraged)