From 2c4e9333accfcacec2580e1b5b2306478f14e226 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Feb 2026 15:20:55 +0000 Subject: [PATCH] fix(deps): update module github.com/openshift/imagebuilder to v1.2.20 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../openshift/imagebuilder/.travis.yml | 15 +++--------- .../openshift/imagebuilder/README.md | 2 +- .../openshift/imagebuilder/builder.go | 23 ++++++++++++++++++- .../openshift/imagebuilder/dispatchers.go | 8 ++++++- .../openshift/imagebuilder/imagebuilder.spec | 2 +- vendor/modules.txt | 2 +- 8 files changed, 38 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 5eea886229..83aa866006 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/opencontainers/runtime-spec v1.3.0 github.com/opencontainers/runtime-tools v0.9.1-0.20251205004911-5e639034dcdc github.com/opencontainers/selinux v1.13.1 - github.com/openshift/imagebuilder v1.2.19 + github.com/openshift/imagebuilder v1.2.20 github.com/rootless-containers/rootlesskit/v2 v2.3.6 github.com/shirou/gopsutil/v4 v4.25.12 github.com/sirupsen/logrus v1.9.4 diff --git a/go.sum b/go.sum index 17805ff353..7fcd44e8f2 100644 --- a/go.sum +++ b/go.sum @@ -309,8 +309,8 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20251205004911-5e639034dcdc h1: github.com/opencontainers/runtime-tools v0.9.1-0.20251205004911-5e639034dcdc/go.mod h1:DKDEfzxvRkoQ6n9TGhxQgg2IM1lY4aM0eaQP4e3oElw= github.com/opencontainers/selinux v1.13.1 h1:A8nNeceYngH9Ow++M+VVEwJVpdFmrlxsN22F+ISDCJE= github.com/opencontainers/selinux v1.13.1/go.mod h1:S10WXZ/osk2kWOYKy1x2f/eXF5ZHJoUs8UU/2caNRbg= -github.com/openshift/imagebuilder v1.2.19 h1:Xqq36KMJgsRU2MPaLRML23Myvk+AaY8pE8VJ6m6Vmy4= -github.com/openshift/imagebuilder v1.2.19/go.mod h1:fdbnfQWjxMBoB/jrvEzUk+UT1zqvtZZj7oQ7GU6RD9I= +github.com/openshift/imagebuilder v1.2.20 h1:oMGLqJ9Z3xHitzBCL+HECg/c9KCV/Rh7IKJqbSaBnqk= +github.com/openshift/imagebuilder v1.2.20/go.mod h1:KyPwIOzCzleBWdDmApxog8sj2SO9l5g4IWPv7S67Fgs= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ= diff --git a/vendor/github.com/openshift/imagebuilder/.travis.yml b/vendor/github.com/openshift/imagebuilder/.travis.yml index 6d65aa2c2c..191fc6247d 100644 --- a/vendor/github.com/openshift/imagebuilder/.travis.yml +++ b/vendor/github.com/openshift/imagebuilder/.travis.yml @@ -6,21 +6,15 @@ arch: - amd64 - arm64 -dist: jammy +dist: noble services: - docker go: - - "1.22.12" + - "1.23.12" before_install: - - sudo systemctl stop docker.service && sudo systemctl stop docker.socket - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - - yes | sudo add-apt-repository "deb [arch=${TRAVIS_CPU_ARCH}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - - sudo apt-get update -q -y - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce - - sudo systemctl enable --now docker.service && sudo systemctl enable --now docker.socket - docker pull mirror.gcr.io/alpine - docker pull mirror.gcr.io/busybox - docker pull public.ecr.aws/docker/library/centos:7 @@ -34,7 +28,4 @@ before_install: script: - make build - make test - - travis_wait 45 make test-conformance - -notifications: - irc: "chat.freenode.net#openshift-dev" + - travis_wait 45 make test-conformance DOCKER_API_VERSION=1.44 diff --git a/vendor/github.com/openshift/imagebuilder/README.md b/vendor/github.com/openshift/imagebuilder/README.md index e83449b293..78260235a5 100644 --- a/vendor/github.com/openshift/imagebuilder/README.md +++ b/vendor/github.com/openshift/imagebuilder/README.md @@ -112,5 +112,5 @@ docker rmi registry.fedoraproject.org/fedora-minimal:42-aarch64; docker pull reg docker rmi mirror.gcr.io/golang:1.24; docker pull mirror.gcr.io/golang:1.24 docker rmi mirror.gcr.io/nginx; docker pull mirror.gcr.io/nginx chmod -R go-w ./dockerclient/testdata -go test ./dockerclient -tags conformance -timeout 30m +env DOCKER_API_VERSION=1.44 go test ./dockerclient -tags conformance -timeout 30m ``` diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go index d41de5ab67..0fd07efd90 100644 --- a/vendor/github.com/openshift/imagebuilder/builder.go +++ b/vendor/github.com/openshift/imagebuilder/builder.go @@ -317,6 +317,18 @@ func NewStages(node *parser.Node, b *Builder) (Stages, error) { } inheritedArgs := argInstructionsInStages[from] thisStageArgs := slices.Clone(inheritedArgs) + filteredUserArgs := make(map[string]string) + for k, v := range b.UserArgs { + for _, a := range b.GlobalAllowedArgs { + if a == k { + filteredUserArgs[k] = v + } + } + } + userArgs := envMapAsSlice(filteredUserArgs) + userArgs = mergeEnv(envMapAsSlice(b.BuiltinArgDefaults), userArgs) + userArgs = mergeEnv(envMapAsSlice(builtinArgDefaults), userArgs) + userArgs = mergeEnv(envMapAsSlice(b.HeadingArgs), userArgs) for _, child := range s.Node.Children { if !strings.EqualFold(child.Value, command.Arg) { continue @@ -329,7 +341,12 @@ func NewStages(node *parser.Node, b *Builder) (Stages, error) { } next := child.Next for next != nil { - thisStageArgs = append(thisStageArgs, next.Value) + processedValue, err := ProcessWord(next.Value, userArgs) + if err != nil { + return fmt.Errorf("processing ARG %q", next.Value) + } + thisStageArgs = append(thisStageArgs, processedValue) + userArgs = mergeEnv(userArgs, []string{processedValue}) next = next.Next } } @@ -492,6 +509,10 @@ type Builder struct { // Raw platform string specified with `FROM --platform` of the stage // It's up to the implementation or client to parse and use this field Platform string + // After contains the stage name specified with `FROM --after=`. This + // declares a dependency on another stage. It's up to the implementation or + // client to handle this field. + After string // Overrides for TARGET... and BUILD... values. TARGET... values are // typically only necessary if the builder's target platform is not the diff --git a/vendor/github.com/openshift/imagebuilder/dispatchers.go b/vendor/github.com/openshift/imagebuilder/dispatchers.go index 3726dc7c9f..3672f69e8e 100644 --- a/vendor/github.com/openshift/imagebuilder/dispatchers.go +++ b/vendor/github.com/openshift/imagebuilder/dispatchers.go @@ -364,8 +364,14 @@ func from(b *Builder, args []string, attributes map[string]bool, flagArgs []stri return fmt.Errorf("no value specified for --platform=") } b.Platform = platformString + case strings.HasPrefix(arg, "--after="): + afterStage := strings.TrimPrefix(arg, "--after=") + if afterStage == "" { + return fmt.Errorf("no value specified for --after=") + } + b.After = afterStage default: - return fmt.Errorf("FROM only supports the --platform flag") + return fmt.Errorf("FROM only supports the --platform and --after flags") } } b.RunConfig.Image = name diff --git a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec index ff39b27384..db797a83af 100644 --- a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec +++ b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec @@ -12,7 +12,7 @@ # %global golang_version 1.19 -%{!?version: %global version 1.2.19} +%{!?version: %global version 1.2.20} %{!?release: %global release 1} %global package_name imagebuilder %global product_name Container Image Builder diff --git a/vendor/modules.txt b/vendor/modules.txt index 18c149a582..1ac3b0084f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -592,7 +592,7 @@ github.com/opencontainers/runtime-tools/validate/capabilities github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/imagebuilder v1.2.19 +# github.com/openshift/imagebuilder v1.2.20 ## explicit; go 1.23.3 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command