From 06ce73de61363d06991d009a6ebef30c95cd5737 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 May 2026 19:34:40 +0000 Subject: [PATCH] Update module github.com/openshift/imagebuilder to v1.2.21 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- vendor/github.com/openshift/imagebuilder/.travis.yml | 8 ++++---- vendor/github.com/openshift/imagebuilder/README.md | 6 +++--- vendor/github.com/openshift/imagebuilder/builder.go | 11 +++++------ .../imagebuilder/dockerfile/parser/line_parsers.go | 2 +- .../imagebuilder/dockerfile/parser/parser.go | 2 +- .../openshift/imagebuilder/imagebuilder.spec | 2 +- vendor/modules.txt | 4 ++-- 9 files changed, 20 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index 524a6a2650..32fd87cfc4 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.20260316125833-8a4db579f5c8 github.com/opencontainers/selinux v1.13.1 - github.com/openshift/imagebuilder v1.2.20 + github.com/openshift/imagebuilder v1.2.21 github.com/rootless-containers/rootlesskit/v2 v2.3.6 github.com/shirou/gopsutil/v4 v4.26.4 github.com/sirupsen/logrus v1.9.4 diff --git a/go.sum b/go.sum index a734e7616a..5c0a3059c5 100644 --- a/go.sum +++ b/go.sum @@ -299,8 +299,8 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20260316125833-8a4db579f5c8 h1: github.com/opencontainers/runtime-tools v0.9.1-0.20260316125833-8a4db579f5c8/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.20 h1:oMGLqJ9Z3xHitzBCL+HECg/c9KCV/Rh7IKJqbSaBnqk= -github.com/openshift/imagebuilder v1.2.20/go.mod h1:KyPwIOzCzleBWdDmApxog8sj2SO9l5g4IWPv7S67Fgs= +github.com/openshift/imagebuilder v1.2.21 h1:XX0tZVznWTxzYevvNVZ/0eeTzmgY6cfcT4/xjs5ToyU= +github.com/openshift/imagebuilder v1.2.21/go.mod h1:+L09sXUQ0RPdCU1tmzKrfBhqMlYvZtaA3MHb7aTjVU8= 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 191fc6247d..49942a845e 100644 --- a/vendor/github.com/openshift/imagebuilder/.travis.yml +++ b/vendor/github.com/openshift/imagebuilder/.travis.yml @@ -12,7 +12,7 @@ services: - docker go: - - "1.23.12" + - "1.25.5" before_install: - docker pull mirror.gcr.io/alpine @@ -20,9 +20,9 @@ before_install: - docker pull public.ecr.aws/docker/library/centos:7 - docker pull mirror.gcr.io/debian - docker pull registry.fedoraproject.org/fedora-minimal - - docker pull registry.fedoraproject.org/fedora-minimal:42-x86_64 - - docker pull registry.fedoraproject.org/fedora-minimal:42-aarch64 - - docker pull mirror.gcr.io/golang:1.24 + - docker pull registry.fedoraproject.org/fedora-minimal:44-x86_64 + - docker pull registry.fedoraproject.org/fedora-minimal:44-aarch64 + - docker pull mirror.gcr.io/golang:1.25 - chmod -R go-w ./dockerclient/testdata script: diff --git a/vendor/github.com/openshift/imagebuilder/README.md b/vendor/github.com/openshift/imagebuilder/README.md index 78260235a5..07eda4450d 100644 --- a/vendor/github.com/openshift/imagebuilder/README.md +++ b/vendor/github.com/openshift/imagebuilder/README.md @@ -107,9 +107,9 @@ docker rmi mirror.gcr.io/busybox; docker pull mirror.gcr.io/busybox docker rmi public.ecr.aws/docker/library/centos:7; docker pull public.ecr.aws/docker/library/centos:7 docker rmi mirror.gcr.io/debian; docker pull mirror.gcr.io/debian docker rmi registry.fedoraproject.org/fedora-minimal; docker pull registry.fedoraproject.org/fedora-minimal -docker rmi registry.fedoraproject.org/fedora-minimal:42-x86_64; docker pull registry.fedoraproject.org/fedora-minimal:42-x86_64 -docker rmi registry.fedoraproject.org/fedora-minimal:42-aarch64; docker pull registry.fedoraproject.org/fedora-minimal:42-aarch64 -docker rmi mirror.gcr.io/golang:1.24; docker pull mirror.gcr.io/golang:1.24 +docker rmi registry.fedoraproject.org/fedora-minimal:44-x86_64; docker pull registry.fedoraproject.org/fedora-minimal:44-x86_64 +docker rmi registry.fedoraproject.org/fedora-minimal:44-aarch64; docker pull registry.fedoraproject.org/fedora-minimal:44-aarch64 +docker rmi mirror.gcr.io/golang:1.25; docker pull mirror.gcr.io/golang:1.25 docker rmi mirror.gcr.io/nginx; docker pull mirror.gcr.io/nginx chmod -R go-w ./dockerclient/testdata 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 0fd07efd90..3ca78b05ac 100644 --- a/vendor/github.com/openshift/imagebuilder/builder.go +++ b/vendor/github.com/openshift/imagebuilder/builder.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - "io/ioutil" "log" "os" "path/filepath" @@ -213,7 +212,7 @@ var ( type Stages []Stage func (stages Stages) ByName(name string) (Stage, bool) { - for _, stage := range stages { + for _, stage := range slices.Backward(stages) { if stage.Name == name { return stage, true } @@ -241,7 +240,7 @@ func (stages Stages) ByTarget(target string) (Stages, bool) { if len(target) == 0 { return stages, true } - for i, stage := range stages { + for i, stage := range slices.Backward(stages) { if stage.Name == target { return stages[i : i+1], true } @@ -264,7 +263,7 @@ func (stages Stages) ThroughTarget(target string) (Stages, bool) { if len(target) == 0 { return stages, true } - for i, stage := range stages { + for i, stage := range slices.Backward(stages) { if stage.Name == target { return stages[0 : i+1], true } @@ -284,7 +283,7 @@ func (stages Stages) ThroughTarget(target string) (Stages, bool) { type Stage struct { Position int - Name string + Name string // may just be strconv.Itoa(Position), be sure to search from back to front Builder *Builder Node *parser.Node } @@ -829,7 +828,7 @@ func ParseIgnoreReader(r io.Reader) ([]string, error) { func ParseIgnore(path string) ([]string, error) { var excludes []string - ignores, err := ioutil.ReadFile(path) + ignores, err := os.ReadFile(path) if err != nil { return excludes, err } diff --git a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/line_parsers.go b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/line_parsers.go index 24d05dc8b0..7d702d8937 100644 --- a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/line_parsers.go +++ b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/line_parsers.go @@ -155,7 +155,7 @@ func parseNameVal(rest string, key string, d *Directive) (*Node, error) { if !strings.Contains(words[0], "=") { parts := tokenWhitespace.Split(rest, 2) if len(parts) < 2 { - return nil, fmt.Errorf(key + " must have two arguments") + return nil, fmt.Errorf("%s must have two arguments", key) } return newKeyValueNode(parts[0], parts[1]), nil } diff --git a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go index e1d4a21fa1..8bfee5ee33 100644 --- a/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go +++ b/vendor/github.com/openshift/imagebuilder/dockerfile/parser/parser.go @@ -291,7 +291,7 @@ func (r *Result) PrintWarnings(out io.Writer) { if len(r.Warnings) == 0 { return } - fmt.Fprintf(out, strings.Join(r.Warnings, "\n")+"\n") + io.WriteString(out, strings.Join(r.Warnings, "\n")+"\n") } // Parse reads lines from a Reader, parses the lines into an AST and returns diff --git a/vendor/github.com/openshift/imagebuilder/imagebuilder.spec b/vendor/github.com/openshift/imagebuilder/imagebuilder.spec index db797a83af..f6fc034159 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.20} +%{!?version: %global version 1.2.21} %{!?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 6b64c576a5..a06e964de7 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -516,8 +516,8 @@ 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.20 -## explicit; go 1.23.3 +# github.com/openshift/imagebuilder v1.2.21 +## explicit; go 1.25.5 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command github.com/openshift/imagebuilder/dockerfile/parser