Skip to content

Bug 1949050: Update containers/image #737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 3 commits into from
Apr 13, 2021
Merged

Bug 1949050: Update containers/image #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d56d3a
Return from the openshift/containers-image fork to the original repo
mtrmac Feb 11, 2021
0a00a1f
Update the c/image references to use c/image/v5
mtrmac Feb 16, 2021
b5b74dd
Update to github.com/containers/image/v5
mtrmac Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@ require (
github.com/apcera/gssapi v0.0.0-00010101000000-000000000000
github.com/aws/aws-sdk-go v1.35.24
github.com/blang/semver v3.5.1+incompatible
github.com/boltdb/bolt v1.3.1 // indirect
github.com/containers/image v0.0.0-00010101000000-000000000000
github.com/containers/storage v0.0.0-20190726081758-912de200380a // indirect
github.com/containers/image/v5 v5.10.2
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.3+incompatible
github.com/docker/docker-credential-helpers v0.6.3 // indirect
github.com/docker/go-units v0.4.0
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7
github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1
Expand All @@ -31,16 +28,13 @@ require (
github.com/gonum/mathext v0.0.0-20181121095525-8a4bf007ea55 // indirect
github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b // indirect
github.com/google/go-cmp v0.5.4
github.com/imdario/mergo v0.3.8 // indirect
github.com/magefile/mage v1.11.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.0
github.com/moby/buildkit v0.0.0-20181107081847-c3a857e3fca0
github.com/mtrmac/gpgme v0.1.2 // indirect
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
github.com/opencontainers/runc v1.0.0-rc9 // indirect
github.com/openshift/api v0.0.0-20210105115604-44119421ec6b
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49
Expand All @@ -54,7 +48,6 @@ require (
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
github.com/xeipuuv/gojsonschema v1.1.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073
golang.org/x/text v0.3.5 // indirect
Expand All @@ -78,7 +71,6 @@ require (
replace (
github.com/Microsoft/hcsshim => github.com/Microsoft/hcsshim v0.8.7
github.com/apcera/gssapi => github.com/openshift/gssapi v0.0.0-20161010215902-5fb4217df13b
github.com/containers/image => github.com/openshift/containers-image v0.0.0-20190130162819-76de87591e9d
// temporary pins to latest commit from soltysh/k8s-1.21 branches
github.com/openshift/api => github.com/soltysh/api v0.0.0-20210329125043-97dfec49c179
github.com/openshift/client-go => github.com/soltysh/client-go v0.0.0-20210329131047-e53d4b5c79d3
Expand Down
91 changes: 65 additions & 26 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pkg/cli/admin/verifyimagesignature/verify-signature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"path/filepath"
"strings"

"github.com/containers/image/docker/policyconfiguration"
"github.com/containers/image/docker/reference"
"github.com/containers/image/signature"
sigtypes "github.com/containers/image/types"
"github.com/containers/image/v5/docker/policyconfiguration"
"github.com/containers/image/v5/docker/reference"
"github.com/containers/image/v5/signature"
sigtypes "github.com/containers/image/v5/types"
"github.com/spf13/cobra"

corev1 "k8s.io/api/core/v1"
Expand Down
129 changes: 0 additions & 129 deletions vendor/github.com/containers/image/manifest/oci.go
View file
Open in desktop

This file was deleted.

0 vendor/github.com/containers/image/LICENSE → ...or/github.com/containers/image/v5/LICENSE
View file
Open in desktop
File renamed without changes.
23 changes: 22 additions & 1 deletion ...mage/docker/policyconfiguration/naming.go → ...e/v5/docker/policyconfiguration/naming.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ntainers/image/docker/reference/README.md → ...iners/image/v5/docker/reference/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tainers/image/docker/reference/helpers.go → ...ners/image/v5/docker/reference/helpers.go
View file
Open in desktop
File renamed without changes.
29 changes: 29 additions & 0 deletions ...iners/image/docker/reference/normalize.go → ...rs/image/v5/docker/reference/normalize.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...iners/image/docker/reference/reference.go → ...rs/image/v5/docker/reference/reference.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions ...ntainers/image/docker/reference/regexp.go → ...iners/image/v5/docker/reference/regexp.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading