From b87c07778e01b6881a1471c6c2e1faf352251c89 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 20:37:16 +0000 Subject: [PATCH] Bump github.com/containers/podman/v5 from 5.1.1 to 5.1.2 Bumps [github.com/containers/podman/v5](https://github.com/containers/podman) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/containers/podman/releases) - [Changelog](https://github.com/containers/podman/blob/v5.1.2/RELEASE_NOTES.md) - [Commits](https://github.com/containers/podman/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: github.com/containers/podman/v5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 4 +-- go.sum | 8 ++--- .../image/v5/docker/docker_image.go | 9 +++++ .../containers/image/v5/version/version.go | 2 +- .../podman/v5/pkg/domain/entities/engine.go | 1 + .../podman/v5/pkg/specgenutil/specgen.go | 34 ++++++++++--------- .../podman/v5/version/rawversion/version.go | 2 +- vendor/modules.txt | 4 +-- 8 files changed, 38 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index add990b13..c5e4e17e0 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/BurntSushi/toml v1.4.0 github.com/containers/buildah v1.36.0 github.com/containers/common v0.59.1 - github.com/containers/podman/v5 v5.1.1 + github.com/containers/podman/v5 v5.1.2 github.com/containers/storage v1.54.0 github.com/distribution/reference v0.6.0 github.com/docker/docker v26.1.3+incompatible @@ -42,7 +42,7 @@ require ( github.com/containerd/errdefs v0.1.0 // indirect github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect - github.com/containers/image/v5 v5.31.0 // indirect + github.com/containers/image/v5 v5.31.1 // indirect github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 // indirect github.com/containers/ocicrypt v1.1.10 // indirect github.com/containers/psgo v1.9.0 // indirect diff --git a/go.sum b/go.sum index 299d2d155..d35272234 100644 --- a/go.sum +++ b/go.sum @@ -52,14 +52,14 @@ github.com/containers/buildah v1.36.0 h1:e369nE9bx0yJtPVRDMsbr0OzkW59XCYAl+5poGh github.com/containers/buildah v1.36.0/go.mod h1:qlEF4RuCnzEUTQhAnCyGr5WoYNZaU0k2mPcZscUR//c= github.com/containers/common v0.59.1 h1:7VkmJN3YvD0jLFwaUjLHSRJ98JLffydiyOJjYr0dUTo= github.com/containers/common v0.59.1/go.mod h1:53VicJCZ2AD0O+Br7VVoyrS7viXF4YmwlTIocWUT8XE= -github.com/containers/image/v5 v5.31.0 h1:eDFVlz5XaYICxe9dXpf23htEKvyosgkl62mJlIATXE4= -github.com/containers/image/v5 v5.31.0/go.mod h1:5QfOqSackPkSbF7Qxc1DnVNnPJKQ+KWLkfEfDpK590Q= +github.com/containers/image/v5 v5.31.1 h1:3x9soI6Biml/GiDLpkSmKrkRSwVGctxu/vONpoUdklA= +github.com/containers/image/v5 v5.31.1/go.mod h1:5QfOqSackPkSbF7Qxc1DnVNnPJKQ+KWLkfEfDpK590Q= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01/go.mod h1:9rfv8iPl1ZP7aqh9YA68wnZv2NUDbXdcdPHVz0pFbPY= github.com/containers/ocicrypt v1.1.10 h1:r7UR6o8+lyhkEywetubUUgcKFjOWOaWz8cEBrCPX0ic= github.com/containers/ocicrypt v1.1.10/go.mod h1:YfzSSr06PTHQwSTUKqDSjish9BeW1E4HUmreluQcMd8= -github.com/containers/podman/v5 v5.1.1 h1:Rm0BdJ2gyvf0atynwHsBdHX7NVmnHSAZnyQM6bMLDww= -github.com/containers/podman/v5 v5.1.1/go.mod h1:AAzQ0cVMH8XymapWXCPbxBXah/oEn47dlT6hY4zFwtk= +github.com/containers/podman/v5 v5.1.2 h1:m/X0AfY64ud5EC8Hhy4jP1HfQ2G9LOcBnprOR13uyPk= +github.com/containers/podman/v5 v5.1.2/go.mod h1:HVlVjQbmFAFHRS9r8adDDuLmPS2uXCAeh2tibhV3lK0= github.com/containers/psgo v1.9.0 h1:eJ74jzSaCHnWt26OlKZROSyUyRcGDf+gYBdXnxrMW4g= github.com/containers/psgo v1.9.0/go.mod h1:0YoluUm43Mz2UnBIh1P+6V6NWcbpTL5uRtXyOcH0B5A= github.com/containers/storage v1.54.0 h1:xwYAlf6n9OnIlURQLLg3FYHbO74fQ/2W2N6EtQEUM4I= diff --git a/vendor/github.com/containers/image/v5/docker/docker_image.go b/vendor/github.com/containers/image/v5/docker/docker_image.go index 4c80bb2b5..9741afc3f 100644 --- a/vendor/github.com/containers/image/v5/docker/docker_image.go +++ b/vendor/github.com/containers/image/v5/docker/docker_image.go @@ -14,6 +14,7 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/image/v5/types" "github.com/opencontainers/go-digest" + "github.com/sirupsen/logrus" ) // Image is a Docker-specific implementation of types.ImageCloser with a few extra methods @@ -90,6 +91,14 @@ func GetRepositoryTags(ctx context.Context, sys *types.SystemContext, ref types. } for _, tag := range tagsHolder.Tags { if _, err := reference.WithTag(dr.ref, tag); err != nil { // Ensure the tag does not contain unexpected values + // Per https://github.com/containers/skopeo/issues/2346 , unknown versions of JFrog Artifactory, + // contrary to the tag format specified in + // https://github.com/opencontainers/distribution-spec/blob/8a871c8234977df058f1a14e299fe0a673853da2/spec.md?plain=1#L160 , + // include digests in the list. + if _, err := digest.Parse(tag); err == nil { + logrus.Debugf("Ignoring invalid tag %q matching a digest format", tag) + continue + } return nil, fmt.Errorf("registry returned invalid tag %q: %w", tag, err) } tags = append(tags, tag) diff --git a/vendor/github.com/containers/image/v5/version/version.go b/vendor/github.com/containers/image/v5/version/version.go index 0b5c3bd7a..9e0338158 100644 --- a/vendor/github.com/containers/image/v5/version/version.go +++ b/vendor/github.com/containers/image/v5/version/version.go @@ -8,7 +8,7 @@ const ( // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 31 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 0 + VersionPatch = 1 // VersionDev indicates development branch. Releases will be empty string. VersionDev = "" diff --git a/vendor/github.com/containers/podman/v5/pkg/domain/entities/engine.go b/vendor/github.com/containers/podman/v5/pkg/domain/entities/engine.go index 1a2fcefd0..5c1699011 100644 --- a/vendor/github.com/containers/podman/v5/pkg/domain/entities/engine.go +++ b/vendor/github.com/containers/podman/v5/pkg/domain/entities/engine.go @@ -48,6 +48,7 @@ type PodmanConfig struct { Trace bool // Hidden: Trace execution URI string // URI to RESTful API Service FarmNodeName string // Name of farm node + ConnectionError error // Error when looking up the connection in setupRemoteConnection() Runroot string ImageStore string diff --git a/vendor/github.com/containers/podman/v5/pkg/specgenutil/specgen.go b/vendor/github.com/containers/podman/v5/pkg/specgenutil/specgen.go index 912193b45..c9dc0775d 100644 --- a/vendor/github.com/containers/podman/v5/pkg/specgenutil/specgen.go +++ b/vendor/github.com/containers/podman/v5/pkg/specgenutil/specgen.go @@ -222,7 +222,8 @@ func setNamespaces(rtc *config.Config, s *specgen.SpecGenerator, c *entities.Con } } userns := c.UserNS - if userns == "" && c.Pod == "" { + // caller must make sure s.Pod is set before calling this function. + if userns == "" && s.Pod == "" { if ns, ok := os.LookupEnv("PODMAN_USERNS"); ok { userns = ns } else { @@ -388,6 +389,22 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.StartupHealthConfig.Successes = int(c.StartupHCSuccesses) } + if len(s.Pod) == 0 || len(c.Pod) > 0 { + s.Pod = c.Pod + } + + if len(c.PodIDFile) > 0 { + if len(s.Pod) > 0 { + return errors.New("cannot specify both --pod and --pod-id-file") + } + podID, err := ReadPodIDFile(c.PodIDFile) + if err != nil { + return err + } + s.Pod = podID + } + + // Important s.Pod must be set above here. if err := setNamespaces(rtc, s, c); err != nil { return err } @@ -408,21 +425,6 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions s.PublishExposedPorts = &c.PublishAll } - if len(s.Pod) == 0 || len(c.Pod) > 0 { - s.Pod = c.Pod - } - - if len(c.PodIDFile) > 0 { - if len(s.Pod) > 0 { - return errors.New("cannot specify both --pod and --pod-id-file") - } - podID, err := ReadPodIDFile(c.PodIDFile) - if err != nil { - return err - } - s.Pod = podID - } - expose, err := CreateExpose(c.Expose) if err != nil { return err diff --git a/vendor/github.com/containers/podman/v5/version/rawversion/version.go b/vendor/github.com/containers/podman/v5/version/rawversion/version.go index 9152f4800..860e5becd 100644 --- a/vendor/github.com/containers/podman/v5/version/rawversion/version.go +++ b/vendor/github.com/containers/podman/v5/version/rawversion/version.go @@ -7,4 +7,4 @@ package rawversion // // NOTE: remember to bump the version at the top of the top-level README.md // file when this is bumped. -const RawVersion = "5.1.1" +const RawVersion = "5.1.2" diff --git a/vendor/modules.txt b/vendor/modules.txt index 09f3d1f3d..ff65db76f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -113,7 +113,7 @@ github.com/containers/common/pkg/supplemented github.com/containers/common/pkg/timetype github.com/containers/common/pkg/util github.com/containers/common/version -# github.com/containers/image/v5 v5.31.0 +# github.com/containers/image/v5 v5.31.1 ## explicit; go 1.21 github.com/containers/image/v5/copy github.com/containers/image/v5/directory @@ -199,7 +199,7 @@ github.com/containers/ocicrypt/keywrap/pkcs7 github.com/containers/ocicrypt/spec github.com/containers/ocicrypt/utils github.com/containers/ocicrypt/utils/keyprovider -# github.com/containers/podman/v5 v5.1.1 +# github.com/containers/podman/v5 v5.1.2 ## explicit; go 1.21 github.com/containers/podman/v5/cmd/podman/parse github.com/containers/podman/v5/libpod/define