diff --git a/go.mod b/go.mod index cd62d88525..ac92ebd357 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.5.3 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.2.0 - github.com/containers/buildah v1.28.1-0.20230120225201-4b72f055f1c9 + github.com/containers/buildah v1.29.0 github.com/containers/common v0.51.0 github.com/containers/conmon v2.0.20+incompatible github.com/containers/image/v5 v5.24.0 @@ -90,7 +90,7 @@ require ( github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect - github.com/fsouza/go-dockerclient v1.9.2 // indirect + github.com/fsouza/go-dockerclient v1.9.3 // indirect github.com/go-openapi/analysis v0.21.4 // indirect github.com/go-openapi/errors v0.20.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect diff --git a/go.sum b/go.sum index bf931d30ed..e71324af6d 100644 --- a/go.sum +++ b/go.sum @@ -265,8 +265,8 @@ github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHV github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= github.com/containernetworking/plugins v1.2.0 h1:SWgg3dQG1yzUo4d9iD8cwSVh1VqI+bP7mkPDoSfP9VU= github.com/containernetworking/plugins v1.2.0/go.mod h1:/VjX4uHecW5vVimFa1wkG4s+r/s9qIfPdqlLF4TW8c4= -github.com/containers/buildah v1.28.1-0.20230120225201-4b72f055f1c9 h1:PYCbWPONH1wayhsex2lOzPHNNkJsb0/JLJbqsvVwiok= -github.com/containers/buildah v1.28.1-0.20230120225201-4b72f055f1c9/go.mod h1:jn51X0ofkH9qWsNnAv9ykPC49SyKXMhX1zJ6EDrkGII= +github.com/containers/buildah v1.29.0 h1:rA3S2SXJffrJjvY2kyxOsAaIseDY6Ib77FsD7n88Mj4= +github.com/containers/buildah v1.29.0/go.mod h1:mah+CGmpOjkBJJ5rhOP0M2ETnODhiuhtnXusfh0hc6Q= github.com/containers/common v0.51.0 h1:Ax4YHNTG8cEPHZJcMYRoP7sfBgOISceeyOvmZzmSucg= github.com/containers/common v0.51.0/go.mod h1:3W2WIdalgQfrsX/T5tjX+6CxgT3ThJVN2G9sNuFjuCM= github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6JXHGTUje2ZYobNrkg= @@ -394,8 +394,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fsouza/go-dockerclient v1.7.7/go.mod h1:njNCXvoZj3sLPjf3yO0DPHf1mdLdCPDYPc14GskKA4Y= -github.com/fsouza/go-dockerclient v1.9.2 h1:9jkK66NvF9s+URiCV86o+dsfSTCL4IWNGL3vCxOtXSM= -github.com/fsouza/go-dockerclient v1.9.2/go.mod h1:24so2eqlzP6sqQmmlWuxCnFnGM4PkItSBZlKLVDCjm4= +github.com/fsouza/go-dockerclient v1.9.3 h1:nos0eFmulRVoq9QevZbwJzFS4cFHMoeUTDNC04klEVM= +github.com/fsouza/go-dockerclient v1.9.3/go.mod h1:soNpY8X1z9RW5UxuXU+gA94/ESSbiAoWwsiqYa6ofHQ= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= diff --git a/vendor/github.com/containers/buildah/CHANGELOG.md b/vendor/github.com/containers/buildah/CHANGELOG.md index 32175538b1..9c35c0b21b 100644 --- a/vendor/github.com/containers/buildah/CHANGELOG.md +++ b/vendor/github.com/containers/buildah/CHANGELOG.md @@ -2,6 +2,132 @@ # Changelog +## v1.29.0 (2023-01-25) + + tests: improve build-with-network-test + Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0 + build(deps): bump github.com/onsi/gomega from 1.25.0 to 1.26.0 + Flake 3710 has been closed. Reenable the test. + [CI:DOCS] Fix two diversity issues in a tutorial + build(deps): bump github.com/fsouza/go-dockerclient from 1.9.2 to 1.9.3 + vendor in latests containers/(storage, common, image) + fix bud-multiple-platform-with-base-as-default-arg flake + stage_executor: while mounting stages use freshly built stage + build(deps): bump github.com/fsouza/go-dockerclient from 1.9.0 to 1.9.2 + build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.25.0 + vendor in latests containers/(storage, common, image, ocicyrpt) + [Itests: change the runtime-flag test for crun + [CI:DOCS] README: drop sudo + Fix multi-arch manifest-list build timeouts + Cirrus: Update VM Images + bud: Consolidate multiple synthetic LABEL instructions + build, secret: allow realtive mountpoints wrt to work dir + fixed squash documentation + build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15 + Correct minor comment + Vendor in latest containers/(common, image, storage) + system tests: remove unhelpful assertions + buildah: add prune command and expose CleanCacheMount API + vendor: bump c/storage to a747b27 + Add support for --group-add to buildah from + build(deps): bump actions/stale from 6 to 7 + Add documentation for buildah build --pull=missing + build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14 + build(deps): bump github.com/docker/docker + parse: default ignorefile must not point to symlink outside context + buildah: wrap network setup errors + build, mount: allow realtive mountpoints wrt to work dir + Update to F37 CI VM Images, re-enable prior-fedora + Update vendor or containers/(image, storage, common) + build(deps): bump golang.org/x/crypto from 0.3.0 to 0.4.0 + Update contact information + build(deps): bump golang.org/x/term from 0.2.0 to 0.3.0 + Replace io/ioutil calls with os calls + [skip-ci] GHA/Cirrus-cron: Fix execution order + Vendor in containers/common + build(deps): bump golang.org/x/sys from 0.2.0 to 0.3.0 + remote-cache: support multiple sources and destinations + Update c/storage after https://github.com/containers/storage/pull/1436 + util.SortMounts(): make the returned order more stable + version: Bump to 1.29.0-dev + [CI:BUILD] Cirrus: Migrate OSX task to M1 + Update vendor of containers/(common, storage, image) + mount=type=cache: seperate cache parent on host for each user + Fix installation instructions for Gentoo Linux + build(deps): bump github.com/containerd/containerd from 1.6.9 to 1.6.10 + GHA: Reuse both cirrus rerun and check workflows + Vendor in latest containers/(common,image,storage) + build(deps): bump github.com/onsi/gomega from 1.24.0 to 1.24.1 + copier.Put(): clear up os/syscall mode bit confusion + build(deps): bump golang.org/x/sys from 0.1.0 to 0.2.0 + Use TypeBind consistently to name bind/nullfs mounts + Add no-new-privileges flag + Update vendor of containers/(common, image, storage) + imagebuildah:build with --all-platforms must honor args for base images + codespell code + Expand args and env when using --all-platforms + build(deps): bump github.com/onsi/gomega from 1.23.0 to 1.24.0 + GHA: Simplify Cirrus-Cron check slightly + Stop using ubi8 + remove unnecessary (hence misleading) rmi + chroot: fix mounting of ro bind mounts + executor: honor default ARG value while eval base name + userns: add arbitrary steps/stage to --userns=auto test + Don't set allow.mount in the vnet jail on Freebsd + copier: Preserve file flags when copying archives on FreeBSD + Remove quiet flag, so that it works in podman-remote + test: fix preserve rootfs with --mount for podman-remote + test: fix prune logic for cache-from after adding content summary + vendor in latest containers/(storage, common, image) + Fix RUN --mount=type=bind,from= not preserving rootfs of stage + Define and use a safe, reliable test image + Fix word missing in Container Tools Guide + Makefile: Use $(MAKE) to start sub-makes in install.tools + imagebuildah: pull cache from remote repo after adding content summary + Makefile: Fix install on FreeBSD + Ensure the cache volume locks are unlocked on all paths + Vendor in latest containers/(common,storage) + Simplify the interface of GetCacheMount and getCacheMount + Fix cache locks with multiple mounts + Remove calls to Lockfile.Locked() + Maintain cache mount locks as lock objects instead of paths + test: cleaning cache must not clean lockfiles + run: honor lockfiles for multiple --mount instruction + mount,cache: lockfiles must not be part of users cache content + Update vendor containers/(common,image,storage) + [CI:BUILD] copr: buildah rpm should depend on containers-common-extra + pr-should-include-tests: allow specfile, golangci + build(deps): bump dawidd6/action-send-mail from 3.7.0 to 3.7.1 + build(deps): bump github.com/docker/docker + build(deps): bump github.com/fsouza/go-dockerclient from 1.8.3 to 1.9.0 + Update vendor containers/(common,image,storage) + build(deps): bump actions/upload-artifact from 2 to 3 + build(deps): bump actions/checkout from 2 to 3 + build(deps): bump actions/stale from 1 to 6 + build(deps): bump dawidd6/action-send-mail from 2.2.2 to 3.7.0 + build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0 + sshagent: LockOSThread before setting SocketLabel + Update tests for error message changes + Update c/image after https://github.com/containers/image/pull/1299 + Fix ident for dependabot gha block + build(deps): bump github.com/containers/ocicrypt from 1.1.5 to 1.1.6 + Fix man pages to match latest cobra settings + build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0 + build(deps): bump github.com/onsi/gomega from 1.20.2 to 1.22.1 + test: retrofit 'bud with undefined build arg directory' + imagebuildah: warnOnUnsetBuildArgs while processing stages from executor + Update contrib/buildahimage/Containerfile + Cirrus CI add flavor parameter + Correction - `FLAVOR` not `FLAVOUR` + Changed build argument from `RELEASE` to `FLAVOUR` + Combine buildahimage Containerfiles + bud.bats refactoring: $TEST_SCRATCH_DIR, part 2 of 2 + bud.bats refactoring: $TEST_SCRATCH_DIR, part 1 of 2 + System test cleanup: document, clarify, fix + test: removing unneeded/expensive COPY + test: warning behaviour for unset/set TARGETOS,TARGETARCH,TARGETPLATFORM + Bump to v1.28.1-dev + ## v1.28.0 (2022-09-30) Update vendor containers/(common,image) diff --git a/vendor/github.com/containers/buildah/changelog.txt b/vendor/github.com/containers/buildah/changelog.txt index 1d066f0686..61fc1698ab 100644 --- a/vendor/github.com/containers/buildah/changelog.txt +++ b/vendor/github.com/containers/buildah/changelog.txt @@ -1,3 +1,128 @@ +- Changelog for v1.29.0 (2023-01-25) + * tests: improve build-with-network-test + * Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0 + * build(deps): bump github.com/onsi/gomega from 1.25.0 to 1.26.0 + * Flake 3710 has been closed. Reenable the test. + * [CI:DOCS] Fix two diversity issues in a tutorial + * build(deps): bump github.com/fsouza/go-dockerclient from 1.9.2 to 1.9.3 + * vendor in latests containers/(storage, common, image) + * fix bud-multiple-platform-with-base-as-default-arg flake + * stage_executor: while mounting stages use freshly built stage + * build(deps): bump github.com/fsouza/go-dockerclient from 1.9.0 to 1.9.2 + * build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.25.0 + * vendor in latests containers/(storage, common, image, ocicyrpt) + * [Itests: change the runtime-flag test for crun + * [CI:DOCS] README: drop sudo + * Fix multi-arch manifest-list build timeouts + * Cirrus: Update VM Images + * bud: Consolidate multiple synthetic LABEL instructions + * build, secret: allow realtive mountpoints wrt to work dir + * fixed squash documentation + * build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15 + * Correct minor comment + * Vendor in latest containers/(common, image, storage) + * system tests: remove unhelpful assertions + * buildah: add prune command and expose CleanCacheMount API + * vendor: bump c/storage to a747b27 + * Add support for --group-add to buildah from + * build(deps): bump actions/stale from 6 to 7 + * Add documentation for buildah build --pull=missing + * build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14 + * build(deps): bump github.com/docker/docker + * parse: default ignorefile must not point to symlink outside context + * buildah: wrap network setup errors + * build, mount: allow realtive mountpoints wrt to work dir + * Update to F37 CI VM Images, re-enable prior-fedora + * Update vendor or containers/(image, storage, common) + * build(deps): bump golang.org/x/crypto from 0.3.0 to 0.4.0 + * Update contact information + * build(deps): bump golang.org/x/term from 0.2.0 to 0.3.0 + * Replace io/ioutil calls with os calls + * [skip-ci] GHA/Cirrus-cron: Fix execution order + * Vendor in containers/common + * build(deps): bump golang.org/x/sys from 0.2.0 to 0.3.0 + * remote-cache: support multiple sources and destinations + * Update c/storage after https://github.com/containers/storage/pull/1436 + * util.SortMounts(): make the returned order more stable + * version: Bump to 1.29.0-dev + * [CI:BUILD] Cirrus: Migrate OSX task to M1 + * Update vendor of containers/(common, storage, image) + * mount=type=cache: seperate cache parent on host for each user + * Fix installation instructions for Gentoo Linux + * build(deps): bump github.com/containerd/containerd from 1.6.9 to 1.6.10 + * GHA: Reuse both cirrus rerun and check workflows + * Vendor in latest containers/(common,image,storage) + * build(deps): bump github.com/onsi/gomega from 1.24.0 to 1.24.1 + * copier.Put(): clear up os/syscall mode bit confusion + * build(deps): bump golang.org/x/sys from 0.1.0 to 0.2.0 + * Use TypeBind consistently to name bind/nullfs mounts + * Add no-new-privileges flag + * Update vendor of containers/(common, image, storage) + * imagebuildah:build with --all-platforms must honor args for base images + * codespell code + * Expand args and env when using --all-platforms + * build(deps): bump github.com/onsi/gomega from 1.23.0 to 1.24.0 + * GHA: Simplify Cirrus-Cron check slightly + * Stop using ubi8 + * remove unnecessary (hence misleading) rmi + * chroot: fix mounting of ro bind mounts + * executor: honor default ARG value while eval base name + * userns: add arbitrary steps/stage to --userns=auto test + * Don't set allow.mount in the vnet jail on Freebsd + * copier: Preserve file flags when copying archives on FreeBSD + * Remove quiet flag, so that it works in podman-remote + * test: fix preserve rootfs with --mount for podman-remote + * test: fix prune logic for cache-from after adding content summary + * vendor in latest containers/(storage, common, image) + * Fix RUN --mount=type=bind,from= not preserving rootfs of stage + * Define and use a safe, reliable test image + * Fix word missing in Container Tools Guide + * Makefile: Use $(MAKE) to start sub-makes in install.tools + * imagebuildah: pull cache from remote repo after adding content summary + * Makefile: Fix install on FreeBSD + * Ensure the cache volume locks are unlocked on all paths + * Vendor in latest containers/(common,storage) + * Simplify the interface of GetCacheMount and getCacheMount + * Fix cache locks with multiple mounts + * Remove calls to Lockfile.Locked() + * Maintain cache mount locks as lock objects instead of paths + * test: cleaning cache must not clean lockfiles + * run: honor lockfiles for multiple --mount instruction + * mount,cache: lockfiles must not be part of users cache content + * Update vendor containers/(common,image,storage) + * [CI:BUILD] copr: buildah rpm should depend on containers-common-extra + * pr-should-include-tests: allow specfile, golangci + * build(deps): bump dawidd6/action-send-mail from 3.7.0 to 3.7.1 + * build(deps): bump github.com/docker/docker + * build(deps): bump github.com/fsouza/go-dockerclient from 1.8.3 to 1.9.0 + * Update vendor containers/(common,image,storage) + * build(deps): bump actions/upload-artifact from 2 to 3 + * build(deps): bump actions/checkout from 2 to 3 + * build(deps): bump actions/stale from 1 to 6 + * build(deps): bump dawidd6/action-send-mail from 2.2.2 to 3.7.0 + * build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0 + * sshagent: LockOSThread before setting SocketLabel + * Update tests for error message changes + * Update c/image after https://github.com/containers/image/pull/1299 + * Fix ident for dependabot gha block + * build(deps): bump github.com/containers/ocicrypt from 1.1.5 to 1.1.6 + * Fix man pages to match latest cobra settings + * build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0 + * build(deps): bump github.com/onsi/gomega from 1.20.2 to 1.22.1 + * test: retrofit 'bud with undefined build arg directory' + * imagebuildah: warnOnUnsetBuildArgs while processing stages from executor + * Update contrib/buildahimage/Containerfile + * Cirrus CI add flavor parameter + * Correction - `FLAVOR` not `FLAVOUR` + * Changed build argument from `RELEASE` to `FLAVOUR` + * Combine buildahimage Containerfiles + * bud.bats refactoring: $TEST_SCRATCH_DIR, part 2 of 2 + * bud.bats refactoring: $TEST_SCRATCH_DIR, part 1 of 2 + * System test cleanup: document, clarify, fix + * test: removing unneeded/expensive COPY + * test: warning behaviour for unset/set TARGETOS,TARGETARCH,TARGETPLATFORM + * Bump to v1.28.1-dev + - Changelog for v1.28.0 (2022-09-30) * Update vendor containers/(common,image) * [CI:DOCS] Add quay-description update reminder diff --git a/vendor/github.com/containers/buildah/define/types.go b/vendor/github.com/containers/buildah/define/types.go index 318e4a3ad3..1325674266 100644 --- a/vendor/github.com/containers/buildah/define/types.go +++ b/vendor/github.com/containers/buildah/define/types.go @@ -30,7 +30,7 @@ const ( Package = "buildah" // Version for the Package. Bump version in contrib/rpm/buildah.spec // too. - Version = "1.29.0-dev" + Version = "1.29.0" // DefaultRuntime if containers.conf fails. DefaultRuntime = "runc" diff --git a/vendor/modules.txt b/vendor/modules.txt index 7caf69bb75..b1059bbf8d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -98,7 +98,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.2.0 ## explicit; go 1.17 github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.28.1-0.20230120225201-4b72f055f1c9 +# github.com/containers/buildah v1.29.0 ## explicit; go 1.17 github.com/containers/buildah github.com/containers/buildah/bind @@ -420,7 +420,7 @@ github.com/felixge/httpsnoop # github.com/fsnotify/fsnotify v1.6.0 ## explicit; go 1.16 github.com/fsnotify/fsnotify -# github.com/fsouza/go-dockerclient v1.9.2 +# github.com/fsouza/go-dockerclient v1.9.3 ## explicit; go 1.18 github.com/fsouza/go-dockerclient # github.com/ghodss/yaml v1.0.0