Commit Graph

5531 Commits

Author SHA1 Message Date
Michael Crosby
6a22a8fc9e Return the underlying images metadata
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-12-04 13:03:41 -05:00
Phil Estes
6ed7ec4472
Merge pull request #3872 from liaojh1998/ctr-run-readonly
Modify ctr run to search for read-only flag instead of readonly
2019-12-04 09:43:25 -05:00
Jie Hao Liao
787be0efe2 Modify ctr run to search for read-only flag instead of readonly
Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
2019-12-04 02:18:23 -06:00
Michael Crosby
5af0dcbe9d
Merge pull request #3869 from estesp/enable-appveyor-for-release-branches
Make sure for next release branch appveyor runs
2019-12-03 17:26:30 -05:00
Phil Estes
cfb4f734da
Make sure for next release branch appveyor runs
This is already added in release/1.3 and release/1.2 was fixed with a
specific branch name at some point.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-12-03 12:51:12 -05:00
Akihiro Suda
8b12d46a39
Merge pull request #3867 from awprice/issue-3865
Fix dependency in BUILDING.md
2019-12-03 11:07:39 +09:00
Alex Price
f92470b3eb Fix dependency in BUILDING.md
This commit fixes the btrfs dependency in the
"Build containerd and runc" section of BUILDING.md needed
for building containerd. btrfs/ioctl.h is now contained in
libbtrfs-dev.

Fixes #3865

Signed-off-by: Alex Price <aprice@atlassian.com>
2019-12-03 11:09:45 +11:00
Michael Crosby
b0821c801d
Merge pull request #3857 from Random-Liu/fix-container-pid
Fix container pid race condition.
2019-12-02 11:43:43 -05:00
Michael Crosby
8883983731
Merge pull request #3860 from sayaoailun/master
update cpuinfo to match kunpeng920 Architecture:aarch64
2019-12-02 09:54:01 -05:00
Michael Crosby
f2ef7b7d79
Merge pull request #3858 from thaJeztah/reformat_vendor
Reformat vendor.conf: use columns, pin by git-sha, and sort alphabetically
2019-12-02 09:03:37 -05:00
Lantao Liu
a6b6097c90 Fix container pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-12-02 01:02:22 -08:00
sayaoailun
726dcaea50 update cpuinfo to make variant matches aarch64 and so on
Signed-off-by: sayaoailun <guojianwei007@126.com>
2019-11-30 23:48:10 +08:00
Sebastiaan van Stijn
6fa9a42ea7
vendor.conf: sort imports alphabetically
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:41 +01:00
Sebastiaan van Stijn
a44189d2ff
vendor.conf: pin all dependencies by git-sha
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:39 +01:00
Sebastiaan van Stijn
55ea3dc9b1
vendor.conf: reformat to use columns
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-29 13:33:32 +01:00
Wei Fu
3a31ce267d
Merge pull request #3853 from dmcgowan/fix-content-test-cleanup-race
Fix cleanup error on content client test
2019-11-27 22:58:37 +08:00
Derek McGowan
3e5402ce02
Merge pull request #3852 from estesp/update-vendors
Update cri and docker vendors
2019-11-26 12:00:04 -08:00
Derek McGowan
8da4346686
Fix cleanup error on content client test
A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-11-26 11:22:35 -08:00
Akihiro Suda
75a46cec6a
Merge pull request #3851 from thaJeztah/bump_go_runc
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
2019-11-26 23:50:40 +09:00
Phil Estes
252d6550f5
Update cri and docker vendors
Update cri and docker to recent commits for mips enablement

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-26 09:46:46 -05:00
Sebastiaan van Stijn
8a66dc6edb
bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
full diff: e029b79d8c...a2952bc25f

- containerd/go-runc#56 fix typo in successfully

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-26 14:54:26 +01:00
Akihiro Suda
45fb5aeaf7
Merge pull request #3793 from dmcgowan/prepare-snapshot-target
Support target snapshot references on prepare
2019-11-26 13:56:18 +09:00
Derek McGowan
526c0db693
Support target snapshot references on prepare
Allows backend snapshots to bring existing snapshots into
a namespace without requiring clients to fully snapshots
when the target reference is known. Backend snapshots must
explicitly implement this functionality, it is equivalent
to sharing across namespaces and is up to the backend to
use the label when it is given or ignore it.

This enables remote snapshot functionality for a backend to
query for a target snapshot before a client has performed
any work to create that snapshot.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-11-25 10:07:25 -08:00
Derek McGowan
d1261b5087
Update snapshot parent filter property to always exist
The parent property may be empty but always exists.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-11-25 10:07:25 -08:00
Wei Fu
383f4a77ee
Merge pull request #3842 from estesp/update-x-sys-vendor
Update golang.org/x/sys to recent commit
2019-11-23 23:25:18 +08:00
Phil Estes
11ef041ff4
Update golang.org/x/sys to recent commit
This prepares us to be able to update docker/docker vendoring to a
recent commit.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-22 19:34:38 -05:00
Michael Crosby
c3b1bc931b
Merge pull request #3836 from egernst/devmapper-docs-update
devmapper: update example base image size in README
2019-11-22 14:35:19 -05:00
Phil Estes
c68848f69b
Merge pull request #3830 from fahedouch/spec_test
improve oci test coverage
2019-11-22 10:05:24 -08:00
fahedouch
afd33bce81 test add tests to spec_opts
Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

test func WithDefaultPathEnv & WithDefaultSpecForPlatform

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

fix nil context

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

[test] TTY information && ProcessCwd

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

fix TestWithTTYSize value

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

test WithUserNamespace sets the uid and gid mappings for the task

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

format test file

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

update TestWithUserNamespace check condition

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

relaunch ci

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

improve spec_opts_test test coverage

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>
2019-11-22 18:16:36 +01:00
Eric Ernst
731e144a48 devmapper: update example base image size in README
base_image_size effectively is the limit of a layer size that can be
created using the devmapper snapshotter. While this will also depend on
the thinpool size itself, something closer to the total image size
(80%?) is more appropriate.

As is, if you try to run an image like elastic, you'll need a much
larger base_image_size than 128MB.

Signed-off-by: Eric Ernst <eric.ernst@intel.com>
2019-11-20 12:26:16 -08:00
Phil Estes
499f346be3
Merge pull request #3832 from darfux/improve_image_is_unpacked_test
test: Do SynchronousDelete cleanup before testing ImageIsUnpacked
2019-11-18 21:19:15 +01:00
Michael Crosby
31ea7b4ede
Merge pull request #3831 from Random-Liu/add-windows-log-file
Add `--log-file` flag for windows service.
2019-11-18 15:00:44 -05:00
Phil Estes
2e293874f1
Merge pull request #3825 from Random-Liu/fix-unpacker
Avoid deadlock in unpacker.
2019-11-18 20:40:45 +01:00
Li Yuxuan
19f7f3ccc4 test: Do SynchronousDelete cleanup before testing ImageIsUnpacked
Simply delete the image will not clean up the snapshots.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
2019-11-17 11:01:35 +08:00
Lantao Liu
0bb48aef07 Add --log-file flag for windows service.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-15 16:57:39 -08:00
Lantao Liu
c560591627 Avoid deadlock in unpacker.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-15 14:01:37 -08:00
Akihiro Suda
ec661e8ceb
Merge pull request #3829 from mxpv/cross
Cross-build nightly builds (arm64, s390x, ppc64el)
2019-11-15 13:13:45 +09:00
Maksym Pavlenko
32ef2e6305 Update README
Add "Nightly builds" section and status badge.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-11-14 15:48:02 -08:00
Maksym Pavlenko
82651d3867 Cross build nightly builds (arm64, s390x, ppc64el)
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-11-14 15:29:56 -08:00
Michael Crosby
d7ec45b172
Merge pull request #3826 from lumjjb/add_unpack_opt
Add client unpack opts
2019-11-14 11:44:20 -05:00
Michael Crosby
bc62a829ac
Merge pull request #3827 from mxpv/nightly
containerd binaries nightly builds
2019-11-14 11:14:13 -05:00
Maksym Pavlenko
c479156b81 Add Github workflow for nightly builds
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-11-13 18:03:35 -08:00
Brandon Lum
856ea30556 Add client unpack opts
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2019-11-13 20:32:55 -05:00
Derek McGowan
a176179a08
Merge pull request #3785 from Random-Liu/support-disk-usage-windows
Support disk usage in windows snapshot.
2019-11-12 14:40:38 -08:00
Phil Estes
2a60547b4e
Merge pull request #3823 from Random-Liu/better-support-windows-build
Better support windows binaries.
2019-11-12 22:47:37 +01:00
Lantao Liu
3db1c3b8f4 Better support windows binaries.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-11-12 11:52:49 -08:00
Maksym Pavlenko
95de2655a7
Merge pull request #3819 from fuweid/me-return-error
snapshots: return error if readSnapshot fails
2019-11-11 11:08:28 -08:00
Michael Crosby
08d4231f57
Merge pull request #3818 from shizhMSFT/fix_ref
Fix panic on reference.Spec.Hostname()
2019-11-11 08:01:23 -05:00
Wei Fu
843423ec38 snapshots: return error if readSnapshot fails
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-11-11 17:53:44 +08:00
Wei Fu
2c1d0880bb
Merge pull request #3810 from thaJeztah/update_mailmap
Update .mailmap to reduce duplicates
2019-11-11 14:47:23 +08:00