Skip to content

Commit

Permalink
Upgrade github.com/containers/image to a released version
Browse files Browse the repository at this point in the history
For some reason dependabot is not picking this one up (is it respecting
the fact that the module is pinned to a commit?). Upgrade
github.com/containers/image to a released version, instead of the commit
we have pinned that module to. That brings github.com/containers/storage
with it.

Fixes: #4648

Signed-off-by: Marcelo E. Magallon <[email protected]>
  • Loading branch information
Marcelo E. Magallon authored and mem committed Oct 22, 2019
1 parent 0480a7d commit 3dde089
Show file tree
Hide file tree
Showing 10 changed files with 67 additions and 63 deletions.
2 changes: 1 addition & 1 deletion cmd/internal/cli/actions.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func handleOCI(ctx context.Context, imgCache *cache.Handle, cmd *cobra.Command,

sysCtx := &ocitypes.SystemContext{
OCIInsecureSkipTLSVerify: noHTTPS,
DockerInsecureSkipTLSVerify: noHTTPS,
DockerInsecureSkipTLSVerify: ocitypes.NewOptionalBool(noHTTPS),
DockerAuthConfig: &authConf,
}

Expand Down
15 changes: 7 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ go 1.13

require (
github.com/Netflix/go-expect v0.0.0-20180928190340-9d1f4485533b
github.com/VividCortex/ewma v1.1.1 // indirect
github.com/alexflint/go-filemutex v0.0.0-20171028004239-d358565f3c3f // indirect
github.com/apex/log v1.1.1
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
Expand All @@ -19,18 +20,18 @@ require (
github.com/containerd/continuity v0.0.0-20180612233548-246e49050efd // indirect
github.com/containernetworking/cni v0.7.1
github.com/containernetworking/plugins v0.8.2
github.com/containers/image v0.0.0-20180612162315-2e4f799f5eba
github.com/containers/storage v0.0.0-20180604200230-88d80428f9b1 // indirect
github.com/containers/image v3.0.2+incompatible
github.com/containers/storage v1.13.5 // indirect
github.com/cyphar/filepath-securejoin v0.2.2 // indirect
github.com/deislabs/oras v0.4.0
github.com/docker/distribution v0.0.0-20180611183926-749f6afb4572 // indirect
github.com/docker/docker v0.0.0-20180522102801-da99009bbb11
github.com/docker/docker-credential-helpers v0.6.0 // indirect
github.com/docker/go-connections v0.3.0 // indirect
github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 // indirect
github.com/docker/go-units v0.3.3 // indirect
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
github.com/dsnet/compress v0.0.1 // indirect
github.com/etcd-io/bbolt v1.3.3 // indirect
github.com/fatih/color v1.7.0
github.com/garyburd/redigo v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand All @@ -46,7 +47,6 @@ require (
github.com/imdario/mergo v0.3.7 // indirect
github.com/juju/errors v0.0.0-20190207033735-e65537c515d7 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/klauspost/pgzip v1.2.1 // indirect
github.com/kr/pty v1.1.8
github.com/kubernetes-sigs/cri-o v0.0.0-20180917213123-8afc34092907
github.com/mattn/go-runewidth v0.0.2 // indirect
Expand All @@ -58,14 +58,12 @@ require (
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/opencontainers/image-spec v0.0.0-20180411145040-e562b0440392
github.com/opencontainers/image-tools v0.0.0-20180129025323-c95f76cbae74
github.com/opencontainers/runc v0.1.1 // indirect
github.com/opencontainers/runtime-spec v0.1.2-0.20181111125026-1722abf79c2f
github.com/opencontainers/runtime-tools v0.9.0
github.com/opencontainers/selinux v1.3.0
github.com/pelletier/go-toml v1.5.0
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect
github.com/pkg/errors v0.8.1
github.com/pquerna/ffjson v0.0.0-20171002144729-d49c2bc1aa13 // indirect
github.com/prometheus/client_golang v0.0.0-20180607123607-faf4ec335fe0 // indirect
github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5 // indirect
github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 // indirect
Expand All @@ -82,9 +80,9 @@ require (
github.com/sylabs/scs-key-client v0.4.1
github.com/sylabs/scs-library-client v0.4.4
github.com/sylabs/sif v1.0.8
github.com/syndtr/gocapability v0.0.0-20180223013746-33e07d32887e // indirect
github.com/urfave/cli v1.21.0 // indirect
github.com/vbatts/go-mtree v0.4.4 // indirect
github.com/vbauerster/mpb v3.4.0+incompatible // indirect
github.com/vishvananda/netlink v1.0.1-0.20190618143317-99a56c251ae6 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
Expand All @@ -93,9 +91,10 @@ require (
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
github.com/yvasiyarov/gorelic v0.0.6 // indirect
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
go.etcd.io/bbolt v1.3.3 // indirect
go4.org v0.0.0-20180417224846-9599cf28b011 // indirect
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734
golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
google.golang.org/grpc v1.20.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
Expand Down
Loading

0 comments on commit 3dde089

Please sign in to comment.