Skip to content

Commit 795c24f

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #3208 from vrothberg/1.15-update-image
[1.15] update github.com/containers/image
2 parents ac76be3 + da9cfce commit 795c24f

File tree

14 files changed

+91
-43
lines changed

14 files changed

+91
-43
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/containernetworking/cni v0.7.1
1515
github.com/containernetworking/plugins v0.8.2
1616
github.com/containers/buildah v1.11.4
17-
github.com/containers/image/v5 v5.0.0
17+
github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0
1818
github.com/containers/libpod v0.8.3-0.20191029195851-e7540d0406c4
1919
github.com/containers/storage v1.13.7
2020
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ github.com/containers/image v3.0.2+incompatible h1:B1lqAE8MUPCrsBLE86J0gnXleeRq8
126126
github.com/containers/image v3.0.2+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeNOm2sRVkSqQTVQ1IlwI3+M=
127127
github.com/containers/image/v5 v5.0.0 h1:arnXgbt1ucsC/ndtSpiQY87rA0UjhF+/xQnPzqdBDn4=
128128
github.com/containers/image/v5 v5.0.0/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
129+
github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0 h1:iV4aHKRoPcHp5BISsuiPMyaCjGJfLKp/FUMAG1NeqvE=
130+
github.com/containers/image/v5 v5.0.1-0.20200205124631-82291c45f2b0/go.mod h1:MgiLzCfIeo8lrHi+4Lb8HP+rh513sm0Mlk6RrhjFOLY=
129131
github.com/containers/libpod v0.8.3-0.20190628005010-4aa109f00e95 h1:b5fISjEVoZbR8jNmN9A1p2sZjBT1op9HeaA9T/zEu6s=
130132
github.com/containers/libpod v0.8.3-0.20190628005010-4aa109f00e95/go.mod h1:dO1PO7t9N5BfdGX0bXhwgBuEgm8DC4QLir8vgdl3ZDY=
131133
github.com/containers/libpod v0.8.3-0.20190628140055-5e42bf071760 h1:JrdoLRKPp84uxgaOKmXP6DK02KU5p6nNEoKWJeD3bbs=

‎lib/container_server_test.go‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,6 @@ var _ = t.Describe("ContainerServer", func() {
6464
Expect(server).To(BeNil())
6565
})
6666

67-
It("should fail when Store is nil", func() {
68-
config, err := libconfig.DefaultConfig()
69-
Expect(err).To(BeNil())
70-
// Given
71-
gomock.InOrder(
72-
libMock.EXPECT().GetStore().Return(nil, nil),
73-
libMock.EXPECT().GetData().Return(config),
74-
)
75-
76-
// When
77-
server, err := lib.New(context.Background(), nil, libMock)
78-
79-
// Then
80-
Expect(err).NotTo(BeNil())
81-
Expect(server).To(BeNil())
82-
})
83-
8467
It("should fail when config is nil", func() {
8568
// Given
8669
// When

‎test/image.bats‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,8 @@ IMAGE=quay.io/crio/pause
66
SIGNED_IMAGE=registry.access.redhat.com/rhel7-atomic:latest
77
UNSIGNED_IMAGE=quay.io/crio/hello-world:latest
88
IMAGE_LIST_TAG=docker.io/library/alpine:3.9
9-
IMAGE_LIST_DIGEST=docker.io/library/alpine@sha256:7746df395af22f04212cd25a92c1d6dbc5a06a0ca9579a229ef43008d4d1302a
10-
IMAGE_LIST_DIGEST_AMD64=docker.io/library/alpine@sha256:bf1684a6e3676389ec861c602e97f27b03f14178e5bc3f70dce198f9f160cce9
11-
IMAGE_LIST_DIGEST_ARM64=docker.io/library/alpine@sha256:1032bdba4c5f88facf7eceb259c18deb28a51785eb35e469285a03eba78dd3fc
12-
IMAGE_LIST_DIGEST_PPC64LE=docker.io/library/alpine@sha256:cb238aa5b34dfd5e57ddfb1bfbb564f01df218e6f6453e4036b302e32bca8bb5
13-
IMAGE_LIST_DIGEST_S390X=docker.io/library/alpine@sha256:d438d3b6a72b602b70bd259ebfb344e388d8809c5abf691f6de397de8c9e4572
9+
IMAGE_LIST_DIGEST=docker.io/library/alpine@sha256:115731bab0862031b44766733890091c17924f9b7781b79997f5f163be262178
10+
IMAGE_LIST_DIGEST_AMD64=docker.io/library/alpine@sha256:ab3fe83c0696e3f565c9b4a734ec309ae9bd0d74c192de4590fd6dc2ef717815
1411

1512
function teardown() {
1613
cleanup_test

‎vendor/github.com/containers/image/v5/docker/docker_client.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/image/v5/docker/docker_image_dest.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/image/v5/docker/docker_image_src.go‎

Lines changed: 6 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/image/v5/docker/tarfile/dest.go‎

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/image/v5/docker/tarfile/src.go‎

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containers/image/v5/image/docker_schema2.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)