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

@@ -27,7 +27,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/seccomp/libseccomp-golang v0.11.1
 	github.com/sirupsen/logrus v1.9.4
 	github.com/spf13/cobra v1.10.2

go.sum

@@ -210,8 +210,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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgmp0tecUJ0sJuv4pzYCqS9+RGSn52M3FUwPs+uo=

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

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
 ```

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=<stage>`. 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

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

vendor/github.com/openshift/imagebuilder/dockerclient/client.go

@@ -191,6 +191,9 @@ func (e *ClientExecutor) Stages(b *imagebuilder.Builder, stages imagebuilder.Sta
 			if err != nil {
 				return nil, fmt.Errorf("error: Determining base image: %v", err)
 			}
+			if b.After != "" {
+				return nil, fmt.Errorf("the --after flag in FROM is not supported by the dockerclient executor")
+			}
 			if prereq := e.Named[from]; prereq != nil {
 				b, ok := stages.ByName(from)
 				if !ok {
@@ -268,6 +271,9 @@ func (e *ClientExecutor) Prepare(b *imagebuilder.Builder, node *parser.Node, fro
 		if err != nil {
 			return err
 		}
+		if b.After != "" {
+			return fmt.Errorf("the --after flag in FROM is not supported by the dockerclient executor")
+		}
 	}
 
 	// load the image

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

vendor/modules.txt

@@ -369,7 +369,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/dockerclient