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 /go.mod | |
| 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 'go.mod')
| -rw-r--r-- | go.mod | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -11,13 +11,13 @@ require ( github.com/container-orchestrated-devices/container-device-interface v0.4.0 github.com/containernetworking/cni v1.0.1 github.com/containernetworking/plugins v1.1.1 - github.com/containers/buildah v1.25.2-0.20220406205807-5b8e79118057 + github.com/containers/buildah v1.25.2-0.20220423102655-8f2bb8876f3f github.com/containers/common v0.47.5-0.20220425182415-4081e6be9356 github.com/containers/conmon v2.0.20+incompatible - github.com/containers/image/v5 v5.21.1-0.20220421124950-8527e238867c + github.com/containers/image/v5 v5.21.1-0.20220425080628-be085685e524 github.com/containers/ocicrypt v1.1.3 github.com/containers/psgo v1.7.2 - github.com/containers/storage v1.39.1-0.20220421071128-4899f8265d63 + github.com/containers/storage v1.39.1-0.20220422100603-8996869ae40b github.com/coreos/go-systemd/v22 v22.3.2 github.com/coreos/stream-metadata-go v0.0.0-20210225230131-70edb9eb47b3 github.com/cyphar/filepath-securejoin v0.2.3 @@ -74,5 +74,3 @@ require ( gopkg.in/inf.v0 v0.9.1 gopkg.in/yaml.v2 v2.4.0 ) - -replace github.com/onsi/gomega => github.com/onsi/gomega v1.16.0 |