From 00d96c2b997561e8226494a29ce63cc23c3fa9f0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 09:35:36 +0000 Subject: [PATCH] fix(deps): update github.com/openshift/imagebuilder digest to ef2a5fe Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- .../openshift/imagebuilder/dispatchers.go | 21 +++++++++++++++++++ vendor/modules.txt | 2 +- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 9a65b76177..2c494ff37f 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/opencontainers/runtime-spec v1.1.1-0.20230922153023-c0e90434df2a github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc github.com/opencontainers/selinux v1.11.0 - github.com/openshift/imagebuilder v1.2.6-0.20231110114814-35a50d57f722 + github.com/openshift/imagebuilder v1.2.6-0.20231127234745-ef2a5fe47510 github.com/rootless-containers/rootlesskit v1.1.1 github.com/shirou/gopsutil/v3 v3.23.10 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 95df02f6df..bf4aeb600e 100644 --- a/go.sum +++ b/go.sum @@ -876,8 +876,8 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec= -github.com/openshift/imagebuilder v1.2.6-0.20231110114814-35a50d57f722 h1:vhEmg+NeucmSYnT2j9ukkZLrR/ZOFUuUiGhxlBAlW8U= -github.com/openshift/imagebuilder v1.2.6-0.20231110114814-35a50d57f722/go.mod h1:+rSifDZnwJPSW2uYHl7ePSVxq4DEu1VlhNR1uIz/Lm4= +github.com/openshift/imagebuilder v1.2.6-0.20231127234745-ef2a5fe47510 h1:ILAESc7vHTVNKctTiR10XC+vACPlR4NbS6570G6QQmY= +github.com/openshift/imagebuilder v1.2.6-0.20231127234745-ef2a5fe47510/go.mod h1:nOaQJMj7VZgdqATqES4GxZX/p6gwK2r7bpE3Ry63+jM= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f h1:/UDgs8FGMqwnHagNDPGOlts35QkhAZ8by3DR7nMih7M= diff --git a/vendor/github.com/openshift/imagebuilder/dispatchers.go b/vendor/github.com/openshift/imagebuilder/dispatchers.go index fdb2aded64..f43adacb43 100644 --- a/vendor/github.com/openshift/imagebuilder/dispatchers.go +++ b/vendor/github.com/openshift/imagebuilder/dispatchers.go @@ -184,6 +184,9 @@ func add(b *Builder, args []string, attributes map[string]bool, flagArgs []strin switch { case strings.HasPrefix(arg, "--chown="): chown = strings.TrimPrefix(arg, "--chown=") + if chown == "" { + return fmt.Errorf("no value specified for --chown=") + } case strings.HasPrefix(arg, "--chmod="): chmod = strings.TrimPrefix(arg, "--chmod=") err = checkChmodConversion(chmod) @@ -192,6 +195,9 @@ func add(b *Builder, args []string, attributes map[string]bool, flagArgs []strin } case strings.HasPrefix(arg, "--checksum="): checksum = strings.TrimPrefix(arg, "--checksum=") + if checksum == "" { + return fmt.Errorf("no value specified for --checksum=") + } default: return fmt.Errorf("ADD only supports the --chmod=, --chown=, and --checksum= flags") } @@ -232,6 +238,9 @@ func dispatchCopy(b *Builder, args []string, attributes map[string]bool, flagArg switch { case strings.HasPrefix(arg, "--chown="): chown = strings.TrimPrefix(arg, "--chown=") + if chown == "" { + return fmt.Errorf("no value specified for --chown=") + } case strings.HasPrefix(arg, "--chmod="): chmod = strings.TrimPrefix(arg, "--chmod=") err = checkChmodConversion(chmod) @@ -240,6 +249,9 @@ func dispatchCopy(b *Builder, args []string, attributes map[string]bool, flagArg } case strings.HasPrefix(arg, "--from="): from = strings.TrimPrefix(arg, "--from=") + if from == "" { + return fmt.Errorf("no value specified for --from=") + } default: return fmt.Errorf("COPY only supports the --chmod= --chown= and the --from= flags") } @@ -302,6 +314,9 @@ func from(b *Builder, args []string, attributes map[string]bool, flagArgs []stri switch { case strings.HasPrefix(arg, "--platform="): platformString := strings.TrimPrefix(arg, "--platform=") + if platformString == "" { + return fmt.Errorf("no value specified for --platform=") + } b.Platform = platformString default: return fmt.Errorf("FROM only supports the --platform flag") @@ -393,9 +408,15 @@ func run(b *Builder, args []string, attributes map[string]bool, flagArgs []strin switch { case strings.HasPrefix(arg, "--mount="): mount := strings.TrimPrefix(arg, "--mount=") + if mount == "" { + return fmt.Errorf("no value specified for --mount=") + } mounts = append(mounts, mount) case strings.HasPrefix(arg, "--network="): network = strings.TrimPrefix(arg, "--network=") + if network == "" { + return fmt.Errorf("no value specified for --network=") + } default: return fmt.Errorf("RUN only supports the --mount and --network flag") } diff --git a/vendor/modules.txt b/vendor/modules.txt index e4bb48dcde..d213e4163e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -883,7 +883,7 @@ github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label github.com/opencontainers/selinux/pkg/pwalk github.com/opencontainers/selinux/pkg/pwalkdir -# github.com/openshift/imagebuilder v1.2.6-0.20231110114814-35a50d57f722 +# github.com/openshift/imagebuilder v1.2.6-0.20231127234745-ef2a5fe47510 ## explicit; go 1.19 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command