-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
vendor latest c/{buildah,common,image,storage} #24447
Conversation
There's one more change you might need from #13808, the |
The buildah failure reproducer: diff --git a/tests/bud/multiarch/Dockerfile.no-run b/tests/bud/multiarch/Dockerfile.no-run
index 959f4be2f..7313f2209 100644
--- a/tests/bud/multiarch/Dockerfile.no-run
+++ b/tests/bud/multiarch/Dockerfile.no-run
@@ -3,7 +3,7 @@
ARG SAFEIMAGE
# A base image that is known to be a manifest list.
-FROM docker.io/library/alpine
+FROM quay.io/libpod/alpine
COPY Dockerfile.no-run /root/
FROM $SAFEIMAGE
diff --git a/vendor/github.com/containers/common/libimage/pull.go b/vendor/github.com/containers/common/libimage/pull.go
index ad4699c60..dec3f82cb 100644
--- a/vendor/github.com/containers/common/libimage/pull.go
+++ b/vendor/github.com/containers/common/libimage/pull.go
@@ -5,6 +5,7 @@ package libimage
import (
"context"
"errors"
+ "sync/atomic"
"fmt"
"io"
"os"
@@ -686,6 +687,11 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
logrus.Errorf("Error recording short-name alias %q: %v", candidateString, err)
}
+ pullCount := firstUse.Add(1)
+ logrus.Errorf("Pull count %d", pullCount)
+ if pullCount ==1 {
+ time.Sleep(3*time.Minute)
+ }
logrus.Debugf("Pulled candidate %s successfully", candidateString)
ids, err := r.imageIDForPulledImage(candidate.Value, manifestBytes)
if err != nil {
@@ -704,3 +710,5 @@ func (r *Runtime) copySingleImageFromRegistry(ctx context.Context, imageName str
return "", resolved.FormatPullErrors(pullErrors)
}
+
+var firstUse atomic.Int32 and bin/buildah build --log-level=debug --jobs=0 --all-platforms --manifest localhost/testlist --build-arg SAFEIMAGE=quay.io/libpod/testimage:20221018 -f tests/bud/multiarch/Dockerfile.no-run tests/bud/multiarch/ I confirm the hypothesis: each per-platform pull moves the |
Also confirming that reverting containers/common@aa722ef fixes this… |
… and, that, alternatively, (today’s version of) containers/image#2609 + containers/common#2209 fixes this reproducer. So I’d prefer this alternative (merging the two PRs) to the revert. I’ll also prepare a test Podman PR based on this one. |
#24462 is running to POC the alternative of obtaining the image ID from c/image instead of doing a lookup. |
5e4310c
to
8016809
Compare
Cockpit tests failed for commit 8016809. @martinpitt, @jelly, @mvollmer please check. |
14bd9c0
to
63dbf1a
Compare
Signed-off-by: Paul Holzinger <[email protected]>
Regression test for containers#23550. Setting the TZDIR env should make no difference for the local timezone as this is not a real timezone name that is resolved from that directory. Signed-off-by: Paul Holzinger <[email protected]>
Added in containers/buildah#5783 Signed-off-by: Paul Holzinger <[email protected]>
@containers/podman-maintainers PTAL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. I'll defer to @edsantiago for the tests.
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: lsm5, Luap99 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Tests LGTM. I'm curious why bud remote tests pass even without https://github.com/containers/podman/pull/13808/files#diff-8ba024261bda9c3e2b398f3af7416765e8b179f0de7470d3794095069d34463e but not curious enough to spend time on it. |
/lgtm |
Also add a regression test for the TZDIR + --tz=local issue that I fixed in c/common containers/common#2219
Does this PR introduce a user-facing change?