diff --git a/go.mod b/go.mod index 485fc6dd2c..c18b92732e 100644 --- a/go.mod +++ b/go.mod @@ -58,7 +58,7 @@ require ( github.com/opencontainers/runtime-spec v1.2.1 github.com/opencontainers/runtime-tools v0.9.1-0.20241108202711-f7e3563b0271 github.com/opencontainers/selinux v1.12.0 - github.com/openshift/imagebuilder v1.2.16-0.20250220150830-7ebfb09d364e + github.com/openshift/imagebuilder v1.2.16-0.20250224193648-e87e4e105fd8 github.com/rootless-containers/rootlesskit/v2 v2.3.2 github.com/shirou/gopsutil/v4 v4.25.2 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index e3f521dc20..113e51db52 100644 --- a/go.sum +++ b/go.sum @@ -367,8 +367,8 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20241108202711-f7e3563b0271 h1: github.com/opencontainers/runtime-tools v0.9.1-0.20241108202711-f7e3563b0271/go.mod h1:oIH6VwKkaDOO+SIYZpdwrC/0wKYqrfO6E1sG1j3UVws= github.com/opencontainers/selinux v1.12.0 h1:6n5JV4Cf+4y0KNXW48TLj5DwfXpvWlxXplUkdTrmPb8= github.com/opencontainers/selinux v1.12.0/go.mod h1:BTPX+bjVbWGXw7ZZWUbdENt8w0htPSrlgOOysQaU62U= -github.com/openshift/imagebuilder v1.2.16-0.20250220150830-7ebfb09d364e h1:yKNaeGlH4+h06lkADFa5rAIG7ifxOiV04kLRCL0rct8= -github.com/openshift/imagebuilder v1.2.16-0.20250220150830-7ebfb09d364e/go.mod h1:cK6MLyBl1IHmIYGLY/2SLOG6p0PtEDUOC7khxsFYUXE= +github.com/openshift/imagebuilder v1.2.16-0.20250224193648-e87e4e105fd8 h1:iPRNMpzJ4HEtIXseOxdIkgNYlp7HJShtEk7URm1BUSU= +github.com/openshift/imagebuilder v1.2.16-0.20250224193648-e87e4e105fd8/go.mod h1:gASl6jikVG3bCFnLjG6Ow5TeKwKVvrqUUj8C7EUmqc8= 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/.travis.yml b/vendor/github.com/openshift/imagebuilder/.travis.yml index da9138bb86..65f7353792 100644 --- a/vendor/github.com/openshift/imagebuilder/.travis.yml +++ b/vendor/github.com/openshift/imagebuilder/.travis.yml @@ -1,17 +1,23 @@ language: go +os: linux + +arch: + - amd64 + - arm64 + dist: jammy services: - docker go: - - "1.21.13" + - "1.22.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=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + - 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 diff --git a/vendor/modules.txt b/vendor/modules.txt index 7a09defdb0..a14490ca27 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -829,8 +829,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.16-0.20250220150830-7ebfb09d364e -## explicit; go 1.21.0 +# github.com/openshift/imagebuilder v1.2.16-0.20250224193648-e87e4e105fd8 +## explicit; go 1.22.0 github.com/openshift/imagebuilder github.com/openshift/imagebuilder/dockerfile/command github.com/openshift/imagebuilder/dockerfile/parser