From 38f9935432c2f9b923f10f48e493d7cdc5ef4ebf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 May 2023 08:13:50 +0000 Subject: [PATCH] fix(deps): update github.com/containers/buildah digest to f353690 Signed-off-by: Renovate Bot --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/containers/buildah/new.go | 8 +++++--- vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c8fcdc0259..d4eefa216a 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.5.4 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.2.0 - github.com/containers/buildah v1.30.1-0.20230501124043-3908816d5310 + github.com/containers/buildah v1.30.1-0.20230502232028-f35369055df7 github.com/containers/common v0.53.1-0.20230502134647-9cd0cc23c80f github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.25.0 diff --git a/go.sum b/go.sum index e4f607ffd3..ab95bc6892 100644 --- a/go.sum +++ b/go.sum @@ -237,8 +237,8 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containernetworking/plugins v1.2.0 h1:SWgg3dQG1yzUo4d9iD8cwSVh1VqI+bP7mkPDoSfP9VU= github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4= -github.com/containers/buildah v1.30.1-0.20230501124043-3908816d5310 h1:xYQch7NrCYPrNcrDUHPc1dE2nwg+2xHiG5l59T+m5Q4= -github.com/containers/buildah v1.30.1-0.20230501124043-3908816d5310/go.mod h1:6A/BK0YJLXL8+AqlbceKJrhUT+NtEgsvAc51F7TAllc= +github.com/containers/buildah v1.30.1-0.20230502232028-f35369055df7 h1:uYGJpYpe79qkVTuEZXl7IFBSIrMXO7iGDtsIBm4JNyk= +github.com/containers/buildah v1.30.1-0.20230502232028-f35369055df7/go.mod h1:6A/BK0YJLXL8+AqlbceKJrhUT+NtEgsvAc51F7TAllc= github.com/containers/common v0.53.1-0.20230502134647-9cd0cc23c80f h1:NGr0tr+qnavYQ3m+ajnrCLCp7y/YlGj14OXsYD5RhqY= github.com/containers/common v0.53.1-0.20230502134647-9cd0cc23c80f/go.mod h1:uG5iTo9KbPxcyj3nsq0OPbBRTrSsrXKIMNRw4D6rt/w= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= diff --git a/vendor/github.com/containers/buildah/new.go b/vendor/github.com/containers/buildah/new.go index d2788505ea..0555d701bc 100644 --- a/vendor/github.com/containers/buildah/new.go +++ b/vendor/github.com/containers/buildah/new.go @@ -239,7 +239,7 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions tmpName = findUnusedContainer(tmpName, containers) } - conflict := 100 + suffixDigitsModulo := 100 for { var flags map[string]interface{} @@ -265,8 +265,10 @@ func newBuilder(ctx context.Context, store storage.Store, options BuilderOptions if !errors.Is(err, storage.ErrDuplicateName) || options.Container != "" { return nil, fmt.Errorf("creating container: %w", err) } - tmpName = fmt.Sprintf("%s-%d", name, rand.Int()%conflict) - conflict = conflict * 10 + tmpName = fmt.Sprintf("%s-%d", name, rand.Int()%suffixDigitsModulo) + if suffixDigitsModulo < 1_000_000_000 { + suffixDigitsModulo *= 10 + } } defer func() { if err != nil { diff --git a/vendor/modules.txt b/vendor/modules.txt index d98d854f0d..2bd83d3c13 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -102,7 +102,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.2.0 ## explicit; go 1.17 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.30.1-0.20230501124043-3908816d5310 +# github.com/containers/buildah v1.30.1-0.20230502232028-f35369055df7 ## explicit; go 1.18 github.com/containers/buildah github.com/containers/buildah/bind