Skip to content

Commit 9177ff2

Browse files
saschagrunertsaschagrunert
committed
Vendor containers/image v4
Forward-port of cri-o#2874 Signed-off-by: Sascha Grunert <[email protected]>
1 parent 63a52d9 commit 9177ff2

File tree

475 files changed

+11379
-7812
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

475 files changed

+11379
-7812
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ mock-image-types: ${MOCKGEN}
305305
${MOCKGEN_FLAGS} \
306306
-package imagetypesmock \
307307
-destination ${MOCK_PATH}/containers/image/types.go \
308-
github.com/containers/image/types ImageCloser
308+
github.com/containers/image/v4/types ImageCloser
309309

310310
mock-ocicni-types: ${MOCKGEN}
311311
${BUILD_BIN_PATH}/mockgen \

‎cmd/crio/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"os"
55

6-
"github.com/containers/image/types"
6+
"github.com/containers/image/v4/types"
77
"github.com/cri-o/cri-o/internal/lib/config"
88
"github.com/cri-o/cri-o/internal/pkg/criocli"
99
"github.com/urfave/cli"

‎cmd/crio/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"strings"
1414
"time"
1515

16-
"github.com/containers/image/types"
16+
"github.com/containers/image/v4/types"
1717
_ "github.com/containers/libpod/pkg/hooks/0.1.0"
1818
"github.com/containers/storage/pkg/reexec"
1919
libconfig "github.com/cri-o/cri-o/internal/lib/config"

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ require (
1313
github.com/containerd/ttrpc v0.0.0-20190613183316-1fb3814edf44
1414
github.com/containernetworking/cni v0.7.1
1515
github.com/containernetworking/plugins v0.8.2
16-
github.com/containers/buildah v1.11.2
16+
github.com/containers/buildah v1.11.3
1717
github.com/containers/conmon v2.0.0+incompatible
18-
github.com/containers/image v3.0.2+incompatible
19-
github.com/containers/libpod v1.5.1
20-
github.com/containers/storage v1.13.4
18+
github.com/containers/image/v4 v4.0.1
19+
github.com/containers/libpod v1.6.2
20+
github.com/containers/storage v1.13.5
2121
github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f
2222
github.com/cpuguy83/go-md2man v1.0.10
2323
github.com/cri-o/ocicni v0.1.1-0.20190702175919-7762645d18ca
24-
github.com/docker/docker v0.7.3-0.20190410184157-6d18c6a06295
24+
github.com/docker/docker v1.4.2-0.20190710153559-aa8249ae1b8b
2525
github.com/docker/go-units v0.4.0
2626
github.com/fsnotify/fsnotify v1.4.7
2727
github.com/go-zoo/bone v1.3.0
@@ -37,7 +37,7 @@ require (
3737
github.com/onsi/ginkgo v1.10.1
3838
github.com/onsi/gomega v1.7.0
3939
github.com/opencontainers/go-digest v1.0.0-rc1
40-
github.com/opencontainers/image-spec v1.0.1
40+
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
4141
github.com/opencontainers/runc v1.0.0-rc8.0.20190827142921-dd075602f158
4242
github.com/opencontainers/runtime-spec v1.0.1
4343
github.com/opencontainers/runtime-tools v0.9.0
@@ -53,7 +53,7 @@ require (
5353
golang.org/x/net v0.0.0-20190918130420-a8b05e9114ab
5454
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e
5555
golang.org/x/sys v0.0.0-20190919044723-0c1ff786ef13
56-
google.golang.org/grpc v1.23.1
56+
google.golang.org/grpc v1.24.0
5757
k8s.io/api v0.0.0
5858
k8s.io/apimachinery v0.0.0
5959
k8s.io/client-go v0.0.0

‎go.sum‎

Lines changed: 85 additions & 0 deletions
Large diffs are not rendered by default.

‎internal/lib/config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111

1212
"github.com/BurntSushi/toml"
1313
conmonconfig "github.com/containers/conmon/runner/config"
14-
"github.com/containers/image/pkg/sysregistriesv2"
15-
"github.com/containers/image/types"
14+
"github.com/containers/image/v4/pkg/sysregistriesv2"
15+
"github.com/containers/image/v4/types"
1616
"github.com/containers/libpod/pkg/rootless"
1717
createconfig "github.com/containers/libpod/pkg/spec"
1818
"github.com/containers/storage"

‎internal/lib/container_server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"sync"
1010
"time"
1111

12-
"github.com/containers/image/types"
12+
"github.com/containers/image/v4/types"
1313
"github.com/containers/libpod/pkg/annotations"
1414
"github.com/containers/libpod/pkg/hooks"
1515
"github.com/containers/libpod/pkg/registrar"

‎internal/pkg/criocli/criocli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"path/filepath"
77
"strings"
88

9-
"github.com/containers/image/types"
9+
"github.com/containers/image/v4/types"
1010
libconfig "github.com/cri-o/cri-o/internal/lib/config"
1111
"github.com/pkg/errors"
1212
"github.com/sirupsen/logrus"

‎internal/pkg/storage/image.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import (
88
"strings"
99
"sync"
1010

11-
"github.com/containers/image/copy"
12-
"github.com/containers/image/docker/reference"
13-
"github.com/containers/image/pkg/sysregistriesv2"
14-
"github.com/containers/image/signature"
15-
istorage "github.com/containers/image/storage"
16-
"github.com/containers/image/transports/alltransports"
17-
"github.com/containers/image/types"
11+
"github.com/containers/image/v4/copy"
12+
"github.com/containers/image/v4/docker/reference"
13+
"github.com/containers/image/v4/pkg/sysregistriesv2"
14+
"github.com/containers/image/v4/signature"
15+
istorage "github.com/containers/image/v4/storage"
16+
"github.com/containers/image/v4/transports/alltransports"
17+
"github.com/containers/image/v4/types"
1818
"github.com/containers/libpod/pkg/rootless"
1919
"github.com/containers/storage"
2020
digest "github.com/opencontainers/go-digest"

‎internal/pkg/storage/image_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"io/ioutil"
66
"os"
77

8-
"github.com/containers/image/copy"
9-
"github.com/containers/image/types"
8+
"github.com/containers/image/v4/copy"
9+
"github.com/containers/image/v4/types"
1010
"github.com/containers/libpod/pkg/rootless"
1111
cs "github.com/containers/storage"
1212
"github.com/cri-o/cri-o/internal/pkg/storage"

0 commit comments

Comments
 (0)