Skip to content
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

Umoci unpack #3921

Closed
wants to merge 9 commits into from
Closed

Umoci unpack #3921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e108bc
Merge pull request #1 from sylabs/master
Jul 11, 2019
dcaef10
Move from image-tools to umoci for OCI unpacking
AdamSimpson Jul 11, 2019
79d975d
uniform error messages
AdamSimpson Jul 11, 2019
ebacae0
freshen up vendor
AdamSimpson Jul 12, 2019
88ddaa5
update vendor
AdamSimpson Jul 12, 2019
cef3431
update vendor
AdamSimpson Jul 12, 2019
6d62c34
vendor from within container
AdamSimpson Jul 12, 2019
51f16a8
vendor using correct image tag
AdamSimpson Jul 12, 2019
6cb861c
Merge pull request #2 from AdamSimpson/umoci_unpack_vendorfix
Jul 12, 2019
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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# Contributors:

- Adam Hughes <[email protected]>, <[email protected]>
- Adam Simpson <[email protected]>, <[email protected]>
- Afif Elghraoui <[email protected]>
- Amanda Duffy <[email protected]>
- Ángel Bejarano <[email protected]>
Expand Down
24 changes: 9 additions & 15 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ require (
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/fatih/color v1.7.0
github.com/garyburd/redigo v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
Expand All @@ -47,15 +45,15 @@ require (
github.com/gorilla/mux v1.6.2 // indirect
github.com/gorilla/websocket v1.4.0
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-multierror v0.0.0-20171204182908-b7773ae21874 // indirect
github.com/imdario/mergo v0.3.7 // indirect
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56 // indirect
github.com/juju/errors v0.0.0-20190207033735-e65537c515d7 // indirect
github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
github.com/juju/testing v0.0.0-20190613124551-e81189438503 // indirect
github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
github.com/klauspost/compress v1.4.1 // indirect
github.com/klauspost/cpuid v1.2.0 // indirect
github.com/kr/pty v1.1.3
github.com/kubernetes-sigs/cri-o v0.0.0-20180917213123-8afc34092907
github.com/mattn/go-colorable v0.1.1 // indirect
Expand All @@ -65,12 +63,12 @@ require (
github.com/mtrmac/gpgme v0.0.0-20170102180018-b2432428689c // indirect
github.com/onsi/ginkgo v1.8.0 // indirect
github.com/onsi/gomega v1.5.0 // indirect
github.com/openSUSE/umoci v0.4.4
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/image-spec v1.0.0
github.com/opencontainers/runc v0.1.1 // indirect
github.com/opencontainers/runtime-spec v0.0.0-20180913141938-5806c3563733
github.com/opencontainers/runtime-tools v0.6.0
github.com/opencontainers/runtime-spec v1.0.0
github.com/opencontainers/runtime-tools v0.7.0
github.com/opencontainers/selinux v1.0.0-rc1
github.com/pelletier/go-toml v1.2.0
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 // indirect
Expand All @@ -83,7 +81,6 @@ require (
github.com/safchain/ethtool v0.0.0-20180504150752-6e3f4faa84e1 // indirect
github.com/satori/go.uuid v1.2.0
github.com/seccomp/libseccomp-golang v0.9.0
github.com/sirupsen/logrus v1.0.5 // indirect
github.com/spf13/cobra v0.0.0-20190321000552-67fc4837d267
github.com/spf13/pflag v1.0.3
github.com/stevvooe/resumable v0.0.0-20180830230917-22b14a53ba50 // indirect
Expand All @@ -92,17 +89,12 @@ require (
github.com/sylabs/scs-key-client v0.3.0-0.20190509220229-bce3b050c4ec
github.com/sylabs/scs-library-client v0.2.2
github.com/sylabs/sif v1.0.5
github.com/syndtr/gocapability v0.0.0-20180223013746-33e07d32887e // indirect
github.com/vishvananda/netlink v1.0.1-0.20190618143317-99a56c251ae6 // indirect
github.com/vishvananda/netns v0.0.0-20171111001504-be1fbeda1936 // indirect
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f // indirect
github.com/xenolf/lego v2.5.0+incompatible // indirect
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
go4.org v0.0.0-20180417224846-9599cf28b011 // indirect
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
Expand All @@ -119,6 +111,8 @@ require (

replace (
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.0.5
github.com/opencontainers/image-tools => github.com/sylabs/image-tools v0.0.0-20181006203805-2814f4980568
github.com/opencontainers/image-spec => github.com/opencontainers/image-spec v0.0.0-20180411145040-e562b0440392
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v0.0.0-20180913141938-5806c3563733
golang.org/x/crypto => github.com/sylabs/golang-x-crypto v0.0.0-20181006204705-4bce89e8e9a9

)
Loading