github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-06-27 15:18:00 +00:00
Code Issues Projects Releases Wiki Activity
802 Commits 17 Branches 101 Tags 85 MiB
e8fb01e1ed
Commit Graph

802 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Miloslav Trmač
e8fb01e1ed Add global --override-arch and --override-os options 
This e.g. allows accessing Linux images on macOS.
 2017-11-16 16:28:03 +01:00
Miloslav Trmač
0543f551c7 Update for changed types.Image/types.ImageCloser 2017-11-16 16:28:03 +01:00
Miloslav Trmač
27f320b27f Vendor after merging mtrmac/image:manifest-lists 2017-11-16 16:27:52 +01:00
Antonio Murdaca
c0dffd9b3e
Merge pull request #452 from runcom/bump-v0.1.26 
[DO NOT MERGE] Bump v0.1.26
 2017-11-15 15:46:41 +01:00
Antonio Murdaca
66a97d038e
version: bump to v0.1.27-dev 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-15 14:49:00 +01:00
Antonio Murdaca
2e8377a708
version: bump to v0.1.26 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-15 14:48:39 +01:00
Daniel J Walsh
a76cfb7dc7
Merge pull request #450 from umohnani8/dir_transport 
Add manifest type conversion to skopeo copy
 2017-11-15 08:32:05 -05:00
Urvashi Mohnani
409dce8a89 Add manifest type conversion to skopeo with dir transport 
User can select from 3 manifest types: oci, v2s1, or v2s2
skopeo copy defaults to oci manifest if the --format flag is not set
Adds option to compress blobs when saving to the directory using the dir transport
e.g skopeo copy --format v2s1 --compress-blobs docker-archive:alp.tar dir:my-directory

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
 2017-11-14 14:45:32 -05:00
Urvashi Mohnani
5b14746045 Vendor in changes from containers/image 
Adds manifest type conversion to dir transport

Signed-off-by: Urvashi Mohnani <umohnani@redhat.com>
 2017-11-14 14:45:32 -05:00
Antonio Murdaca
a3d2e8323a
Merge pull request #409 from runcom/add-logo 
[do not merge yet] add logo :)
 2017-11-14 20:10:20 +01:00
Antonio Murdaca
2be4deb980
README.md: add logo 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-14 20:09:19 +01:00
Antonio Murdaca
5f71547262
Merge pull request #451 from runcom/cve-error-log 
Fix CVE in tar-split
 2017-11-08 16:26:21 +01:00
Antonio Murdaca
6c791a0559
bump back to v0.1.26-dev 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-08 15:59:21 +01:00
Antonio Murdaca
7fd6f66b7f
bump to v0.1.25 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-08 15:59:01 +01:00
Antonio Murdaca
a1b48be22e
Fix CVE in tar-split 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-11-08 15:58:43 +01:00
Antonio Murdaca
bb5584bc4c
Merge pull request #442 from mtrmac/fix-vendor 
Revert mis-merged reverts of vendor.conf
 2017-11-07 20:40:03 +01:00
Miloslav Trmač
3e57660394 Revert mis-merged reverts of vendor.conf 
PR #440 reverted the vendor.conf edits of #426.  This passed CI
because the corresponding vendor/* subpackages were not modified.

Restore the vendor.conf changes, and re-run full (vndr) to ensure
the two are consistent again.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2017-11-07 19:34:26 +01:00
Miloslav Trmač
803619cabf
Merge pull request #447 from marcosps/issue_446 
README.md: Fix example of skopeo copy command
 2017-11-07 17:53:25 +01:00
Marcos Paulo de Souza
8c1a69d1f6 README.md: Fix example of skopeo copy command 
In README.md, there is an example of skopeo copy command to download an
image in OCI format, but the current code returns an error:

skopeo copy docker://busybox:latest oci:busybox_ocilayout
FATA[0000] Error initializing destination oci:tmp:: cannot save image with empty image.ref.name

If we add a tag after the oci directory, the problem is gone:
skopeo copy docker://busybox:latest oci:busybox_ocilayout:latest

Fixes: #446

Signed-off-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
 2017-11-06 22:54:11 -02:00
Miloslav Trmač
24423ce4a7
Merge pull request #443 from nstack/shared-blobs 
copy: add shared blob directory support for OCI sources/destinations
 2017-11-06 18:46:34 +01:00
Jonathan Boulle
76b071cf74 cmd/copy: add {src,dst}-shared-blob-dir flags 
Only works for OCI layout sources and destinations.
 2017-11-06 17:00:39 +01:00
Jonathan Boulle
407a7d9e70 vendor: bump containers/image to master 
To pick up containers/image#369

Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
 2017-11-06 17:00:39 +01:00
Antonio Murdaca
0d0055df05
Merge pull request #444 from mtrmac/contributing-commits 
Modify CONTRIBUTING.md to prefer smaller commits over squashing them
 2017-11-06 16:31:37 +01:00
Miloslav Trmač
63b3be2f13 Modify CONTRIBUTING.md to prefer smaller commits over squashing them 
See the updated text for the rationale.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2017-11-06 16:21:50 +01:00
Antonio Murdaca
62c68998d7
Merge pull request #440 from hferentschik/container-image-issue-327 
[DO NOT MERGE] - Aligning Docker version between containers/image and skopeo
 2017-11-06 11:58:04 +01:00
Hardy Ferentschik
4125d741cf
Aligning Docker version between containers/image and skopeo 
Signed-off-by: Hardy Ferentschik <hardy@hibernate.org>
 2017-11-06 11:45:03 +01:00
Antonio Murdaca
bd07ffb9f4
Merge pull request #426 from mtrmac/single-logrus 
Update image-tools, and remove the duplicate Sirupsen/logrus vendor
 2017-10-31 16:23:48 +01:00
Miloslav Trmač
700199c944 Update image-tools, and remove the duplicate Sirupsen/logrus vendor 2017-10-30 17:24:44 +01:00
Antonio Murdaca
40a5f48632
Merge pull request #441 from mtrmac/smaller-containers 
Create smaller testing containers
 2017-10-28 09:05:30 +02:00
Miloslav Trmač
83ca466071 Remove the openshift/origin checkout from /tmp after building it 2017-10-28 02:19:29 +02:00
Miloslav Trmač
a7e8a9b4d4 Run (dnf clean all) after finishing the installation 
... to drop all caches which will never be needed again.
 2017-10-28 02:17:15 +02:00
Miloslav Trmač
3f10c1726d Do not use a separate yum command to install OpenShift dependencies 
We don't really need to pay the depsolving overhead twice.
 2017-10-28 02:16:25 +02:00
Miloslav Trmač
832eaa1f67 Use ordinary shell variables instead of ENV for REGISTRY_COMMIT* 
They are only used in the immediately following shell snippet,
no need to pollute the container environment with them, nor to add
two extra layers.
 2017-10-28 02:14:44 +02:00
Antonio Murdaca
e2b2d25f24 Merge pull request #439 from TomSweeneyRedHat/dev/tsweeney/dockfix/4 
A few wording touchups to CONTRIBUTING.md
 2017-10-25 17:35:04 +02:00
TomSweeneyRedHat
3fa370fa2e A few wording touchups to CONTRIBUTING.md 
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
 2017-10-25 10:30:26 -04:00
Antonio Murdaca
88cff614ed Merge pull request #408 from cyphar/use-buildmode-pie 
makefile: use -buildmode=pie
 2017-10-22 09:05:53 +02:00
Aleksa Sarai
b23cac9c05
makefile: use -buildmode=pie 
The security benefits of PIC binaries are quite well known (since they
work with ASLR), and there is effectively no downside. In addition,
we've been seeing some weird linker errors on ppc64le that are resolved
by using -buildmode=pie.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2017-10-22 10:13:20 +11:00
Antonio Murdaca
c928962ea8 Merge pull request #438 from runcom/bump-v0.1.24 
Bump v0.1.24
 2017-10-21 19:44:26 +02:00
Antonio Murdaca
ee011b1bf9
bump to v0.1.25-dev 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-21 19:27:29 +02:00
Antonio Murdaca
dd2c3e3a8e
bump to v0.1.24 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-21 19:27:07 +02:00
Antonio Murdaca
f74e3fbb0f Merge pull request #437 from runcom/fix-config-nil 
fix inspect with nil image config
 2017-10-21 18:18:51 +02:00
Antonio Murdaca
e3f7733de1
fix inspect with nil image config 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2017-10-21 18:05:19 +02:00
Antonio Murdaca
5436111796 Merge pull request #435 from mtrmac/brew-failure 
Work around broken brew in Travis
 2017-10-20 15:24:26 +02:00
Miloslav Trmač
b8a502ae87 Work around broken brew in Travis 
Per https://github.com/Homebrew/brew/issues/3299 , (brew update)
is needed to avoid a
> ==> Downloading https://homebrew.bintray.com/bottles-portable/portable-ruby-2.3.3.leopard_64.bottle.1.tar.gz
> ######################################################################## 100.0%
> ==> Pouring portable-ruby-2.3.3.leopard_64.bottle.1.tar.gz
...
> /usr/local/Homebrew/Library/Homebrew/brew.rb:12:in `<main>': Homebrew must be run under Ruby 2.3! You're running 2.0.0. (RuntimeError)

Ideally Travis should bake the (brew update) into its images
(https://github.com/travis-ci/travis-ci/issues/8552 ), but that’s only going
to happen around November 2017 per https://blog.travis-ci.com/2017-10-16-a-new-default-os-x-image-is-coming .

Until then, we have to do that ourselves.
 2017-10-19 18:04:23 +02:00
Jhon Honce
28d4e08a4b Merge pull request #429 from giuseppe/vendor-containers-image 
containers/image: vendor
 2017-10-06 10:24:34 -07:00
Giuseppe Scrivano
ef464797c1 containers/image: vendor 
Vendor in latest containers/image

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
 2017-10-06 18:16:39 +02:00
Antonio Murdaca
2966f794fc Merge pull request #406 from mtrmac/macOS 
Simplify macOS builds
 2017-10-03 13:01:44 +02:00
Miloslav Trmač
37e34aaff2 Automatically use the right CFLAGS and LDFLAGS for gpgme 
On macOS, (brew install gpgme) installs it within /usr/local, but
/usr/local/include is not in the default search path.

Rather than hard-code this directory, use gpgme-config. Sadly that
must be done at the top-level user instead of locally in the gpgme
subpackage, because cgo supports only pkg-config, not general shell
scripts, and gpgme does not install a pkg-config file.

If gpgme is not installed or gpgme-config can’t be found for other reasons,
the error is silently ignored (and the user will probably find out because
the cgo compilation will fail); this is so that users can use the
containers_image_openpgp build tag without seeing ugly errors
(and without the Makefile having to detect that build tag in even more
shell scripts).
 2017-10-02 21:58:23 +02:00
Miloslav Trmač
aa6df53779 Only use the cgo workaround if using gpgme 
Otherwise we would try to link with gpgme only for that unnecessary
workaround.
 2017-10-02 20:49:49 +02:00
Miloslav Trmač
e3170801c5 Merge pull request #427 from rhatdan/vendor 
Vendor in latest containers storage
 2017-10-02 17:46:40 +02:00