diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-26 08:49:38 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-26 08:49:38 -0400 |
commit | 49264c7148c1b14203f16b79994cf1dd927fb5e0 (patch) | |
tree | 84916e4caa7eb18fec097c362cc5753c1d479f5e /vendor/modules.txt | |
parent | ace6672bf1a9b011a3c414783496668b5f27f3eb (diff) | |
download | podman-49264c7148c1b14203f16b79994cf1dd927fb5e0.tar.gz podman-49264c7148c1b14203f16b79994cf1dd927fb5e0.tar.bz2 podman-49264c7148c1b14203f16b79994cf1dd927fb5e0.zip |
vendor in containers/(common,buildah,storage,image)
Changes as of 2022-04-21:
- apply-podman-deltas: minor cleanup
- buildah-tests.diff: deal with:
. buildah #3894 (the registry one), which affected helpers.bash in
a way that resulted in conflicts here; and
. buildah #3917 (etchosts), which caused offset-only diffs
with no conflicts
- Reevaluate the bud skip list, and reenable some tests that
seems to be passing now under podman:
. bud with specified context ...
. two tests that require a local registry (which buildah now runs)
. bud with --cgroup-parent
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/modules.txt')
-rw-r--r-- | vendor/modules.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vendor/modules.txt b/vendor/modules.txt index 4b1f03471..69e276940 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -87,7 +87,7 @@ github.com/containernetworking/cni/pkg/version # github.com/containernetworking/plugins v1.1.1 ## explicit github.com/containernetworking/plugins/pkg/ns -# github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057 +# github.com/containers/buildah v1.25.2-0.20220423102655-8f2bb8876f3f ## explicit github.com/containers/buildah github.com/containers/buildah/bind @@ -155,7 +155,7 @@ github.com/containers/common/version # github.com/containers/conmon v2.0.20+incompatible ## explicit github.com/containers/conmon/runner/config -# github.com/containers/image/v5 v5.21.1-0.20220421124950-8527e238867c +# github.com/containers/image/v5 v5.21.1-0.20220425080628-be085685e524 ## explicit github.com/containers/image/v5/copy github.com/containers/image/v5/directory @@ -235,7 +235,7 @@ github.com/containers/psgo/internal/dev github.com/containers/psgo/internal/host github.com/containers/psgo/internal/proc github.com/containers/psgo/internal/process -# github.com/containers/storage v1.39.1-0.20220421071128-4899f8265d63 +# github.com/containers/storage v1.39.1-0.20220422100603-8996869ae40b ## explicit github.com/containers/storage github.com/containers/storage/drivers @@ -532,7 +532,7 @@ github.com/onsi/ginkgo/reporters/stenographer github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty github.com/onsi/ginkgo/types -# github.com/onsi/gomega v1.19.0 => github.com/onsi/gomega v1.16.0 +# github.com/onsi/gomega v1.19.0 ## explicit github.com/onsi/gomega github.com/onsi/gomega/format @@ -541,6 +541,7 @@ github.com/onsi/gomega/gexec github.com/onsi/gomega/gstruct github.com/onsi/gomega/gstruct/errors github.com/onsi/gomega/internal +github.com/onsi/gomega/internal/gutil github.com/onsi/gomega/matchers github.com/onsi/gomega/matchers/support/goraph/bipartitegraph github.com/onsi/gomega/matchers/support/goraph/edge @@ -867,4 +868,3 @@ gopkg.in/yaml.v2 gopkg.in/yaml.v3 # sigs.k8s.io/yaml v1.3.0 sigs.k8s.io/yaml -# github.com/onsi/gomega => github.com/onsi/gomega v1.16.0 |