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
Daniel J Walsh
4e9ef94365
Vendor in latest containers storage
...
We want to get support into skopeo for handling
override_kernel_checks so that we can use overlay
backend on RHEL.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
2017-09-30 10:40:45 +00:00
Miloslav Trmač
9f54acd6bd
Merge pull request #424 from lsm5/Makefile-go-var
...
use Makefile var for go compiler
2017-09-26 17:54:37 +02:00
Lokesh Mandvekar
e735faac75
use Makefile var for go compiler
...
This will allow compilation with a custom go binary,
for example /usr/lib/go-1.8/bin/go instead of /usr/bin/go on Ubuntu
16.04 which is still version 1.6
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2017-09-25 17:23:00 -04:00
Miloslav Trmač
3c67427272
Merge pull request #422 from umohnani8/auth
...
fixing error checking due to update in make lint
2017-09-21 16:11:37 +02:00
umohnani8
a1865e9d8b
fixing error checking due to update in make lint
...
make lint is complaining for cases where the error returned is checked
for err != nil, and then returned anyways.
Signed-off-by: umohnani8 <umohnani@redhat.com>
2017-09-20 14:45:45 -04:00
Miloslav Trmač
875dd2e7a9
Merge pull request #417 from mtrmac/manifest-list-hofix
...
Vendor in mtrmac/image:manifest-list-hotfix
2017-09-14 17:41:55 +02:00
Miloslav Trmač
75dc703d6a
Mark TestCopyFailsWithManifestList with ExpectFailure
...
This is one of the trade-offs we made.
2017-09-13 19:54:51 +02:00
Miloslav Trmač
fd6324f800
Vendor after merging mtrmac/image:manifest-list-hotfix
2017-09-13 18:47:43 +02:00
Miloslav Trmač
a41cd0a0ab
Merge pull request #413 from TomSweeneyRedHat/dev/tsweeney/docfix/3
...
Spruce up the README.md a bit
2017-09-11 19:55:04 +02:00
TomSweeneyRedHat
b548b5f96f
Spruce up the README.md a bit
...
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2017-09-11 12:54:04 -04:00
Miloslav Trmač
2bfbb4cbf2
Merge pull request #412 from thomasmckay/patch-1
...
update installing build dependencies
2017-09-11 18:17:04 +02:00
thomasmckay
b2297592f3
removed builddep for adding ostree-devel
2017-09-11 08:51:08 -04:00
thomasmckay
fe6073e87e
update installing build dependencies
2017-09-08 09:37:32 -04:00
Antonio Murdaca
09557f308c
Merge pull request #411 from TomSweeneyRedHat/dev/tsweeney/docfix2
...
Touch up a few tpyos
2017-09-08 01:07:48 +02:00
TomSweeneyRedHat
10c2053967
Touch up a few tpyos
...
Signed-off-by: TomSweeneyRedHat <tsweeney@redhat.com>
2017-09-07 14:19:08 -04:00
Miloslav Trmač
55e7b079f1
Merge pull request #403 from owtaylor/requested-manifest-mime-types
...
Update for removal of requestedMIMETypes from ImageReference.NewImageSource()
2017-09-07 18:04:32 +02:00
Owen W. Taylor
035fc3a817
Update for removal of requestedMIMETypes from containers/image/types.ImageReference.NewImageSource()
...
Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2017-09-07 10:28:37 -04:00
Miloslav Trmač
5faf7d8001
Merge pull request #407 from dlorenc/helper
...
Add docker-credential-helpers dependency.
2017-09-04 19:54:15 +02:00
dlorenc
2ada6b20a2
Add docker-credential-helpers dependency.
2017-09-04 10:00:08 -07:00
Miloslav Trmač
16181f1cfb
Merge pull request #404 from mtrmac/shallow-clone
...
Use (git clone --depth=1) to speed up testing
2017-09-02 00:32:57 +02:00