Commit Graph

3512 Commits

Author SHA1 Message Date
Phil Estes
f1cea3fa7a
Merge pull request #2277 from crosbymichael/update-validation
Allow image and snapshotkey to be updated
2018-04-05 17:17:17 -04:00
Michael Crosby
9af8d56cdd Allow image and snapshotkey to be updated
This allows a container's image and snapshot key to be updated via the
Update APIs.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-04-05 17:01:07 -04:00
Derek McGowan
2bc17ef2cb
Merge pull request #2275 from dmcgowan/prepare-1.1.0-rc.1
Prepare 1.1.0-rc.1
2018-04-04 17:14:10 -07:00
Derek McGowan
dabc22f47c
Prepare 1.1.0-rc.1
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-04-04 16:02:35 -07:00
Derek McGowan
49139695aa
Merge pull request #2274 from estesp/debug-travis
Fix broken tests; make sure we don't mask travis script exit codes
2018-04-04 13:24:59 -07:00
Phil Estes
b769cce904
Fix tests using invalid ID
These tests are using their name as ID, but subtests add a forward slash
connected to the parent test, and slash (/) is an invalid character for
container IDs.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-04-04 15:32:02 -04:00
Michael Crosby
ad2548adb4
Merge pull request #2270 from Random-Liu/update-cri-plugin
Update `cri` plugin to v1.0.0-rc.1.
2018-04-04 15:19:01 -04:00
Phil Estes
45407846f3
Test whether use of exit is hiding errors
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-04-04 15:03:55 -04:00
Kenfe-Mickaël Laventure
9d9d1bc13c
Merge pull request #2269 from justincormack/WithPrivileged
Add a WithPrivileged OCI constructor and the options needed to build it
2018-04-04 11:37:29 -07:00
Phil Estes
6c02c5cf0a
Merge pull request #2272 from dmcgowan/fix-platform-pull-test
client: fix multi-platform pull test
2018-04-04 14:24:32 -04:00
Derek McGowan
9f3db59e0a
Update multiplatform pull test
Remove architecture not included in image

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-04-04 10:49:41 -07:00
Justin Cormack
903191072e
Add --privileged option to ctr run
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-04 13:25:42 +01:00
Justin Cormack
062c3a00ef
Add a WithPrivileged OCI constructor and the options needed to build it
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-04 13:25:34 +01:00
Lantao Liu
89d74986cc Update cri plugin to v1.0.0-rc.1.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 21:11:38 +00:00
Michael Crosby
d1b3ea4061
Merge pull request #2268 from justincormack/init-null-spec
Consistently add empty types where they are nil in spec
2018-04-03 10:42:07 -04:00
Phil Estes
417c923d65
Merge pull request #2266 from eirinikos/update-license
Edit Containerd license info so GitHub recognizes it
2018-04-03 10:21:19 -04:00
Justin Cormack
0ee2f35e43
Consistently add empty types where they are nil in spec
In a few places we check for nil types when modifying a spec,
but in many cases we do not so we could get a panic if the
passed in type was not filled. Because the generated spec is
filled we will not notice this but users may get unexpected
panics.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-04-03 14:44:23 +01:00
Stephen Day
8c2acf45fb
Merge pull request #2265 from stevvooe/lockdown-api
api: lock down api for 1.1 release
2018-04-02 14:21:16 -07:00
Andrea Kao
c0c92f6b34 Edit Containerd license info so GitHub recognizes it
GitHub uses a library called Licensee to identify a project's license
type. It shows this information in the status bar and via the API if it
can unambiguously identify the license.

This commit removes the LICENSE.docs file and updates the README to
refer readers directly to the CC-BY-4.0 license on the Creative Commons
site. It also updates the copyright reference to "The containerd
Authors" and removes a reference to copyright year in the LICENSE file
(per a recommendation from the CNCF).

This change allows Licensee to successfully identify the license
type of Containerd's codebase as Apache 2.0.

Signed-off-by: Andrea Kao <eirinikos@gmail.com>
2018-04-02 12:31:15 -07:00
Stephen J Day
ebd96a19d3
api: lock down api for 1.1 release
While there were no changes to the core API for the 1.1 release, we
still need to lock down the 1.1 version of the API to follow the
process.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-04-02 11:56:40 -07:00
Stephen Day
04efcc83a2
Merge pull request #2261 from AkihiroSuda/native-snapshotter
enable native (formerly naive) snapshotter by default
2018-04-02 11:33:25 -07:00
Akihiro Suda
83e35b3d3a enable native (formerly naive) snapshotter by default
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2018-04-02 13:29:19 +09:00
Stephen Day
bf5112e8ec
Merge pull request #2259 from Random-Liu/cleanup-with-user
Improve WithUser comments and code style.
2018-03-30 15:29:08 -07:00
Michael Crosby
1a9f9e65b9
Merge pull request #2258 from mlaventure/fix-stupid-typo
Fix typo in CreateUnixSocket error message
2018-03-30 16:44:34 -04:00
Lantao Liu
00b600a605 Improve WithUser comments and code style.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 20:34:12 +00:00
Michael Crosby
c0f7fcd910
Merge pull request #2257 from Random-Liu/add-with-user
Add oci.WithUser helper function.
2018-03-30 16:26:28 -04:00
Kenfe-Mickael Laventure
81feacd393
Fix typo in CreateUnixSocket error message
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2018-03-30 13:14:55 -07:00
Lantao Liu
45b0045593 Add oci.WithUser helper function.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-30 20:06:25 +00:00
Stephen Day
84a7b9c115
Merge pull request #2255 from mlaventure/unix-socket-toolong-error-msg
Return a better error message is unix socket path is too long.
2018-03-30 10:16:22 -07:00
Kenfe-Mickael Laventure
3c3a676490
Return a better error message is unix socket path is too long.
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2018-03-30 09:00:02 -07:00
Michael Crosby
606be14859
Merge pull request #2238 from tklauser/runc-libapparmor-dep
Drop libapparmor dependency from runc build docs
2018-03-30 10:18:34 -04:00
Derek McGowan
ac5432a06b
Merge pull request #2253 from stevvooe/report-zfs-correctly
vendor: update zfs dependency
2018-03-29 18:30:57 -07:00
Akihiro Suda
7722db0bc5
Merge pull request #2251 from stevvooe/report-aufs-correctly
vendor: update aufs dependency
2018-03-30 09:55:20 +09:00
Stephen J Day
ca4ccf4afc
vendor: update zfs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 14:48:12 -07:00
Stephen J Day
bea2304ca4
vendor: update aufs dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2018-03-29 13:33:10 -07:00
Michael Crosby
cbfc9223a9
Merge pull request #2241 from justincormack/ambient_seccomp
The set of bounding capabilities is the largest group
2018-03-29 13:44:30 -04:00
Phil Estes
def3069a67
Merge pull request #2245 from darrenstahlmsft/CloseFail
Make hcsshim layerwriter close a fatal error
2018-03-29 11:55:57 -04:00
Tobias Klauser
a74903a307 Drop libapparmor dependency from runc build docs
As of opencontainers/runc@db093f621f runc
no longer depends on libapparmor thus libapparmor-dev no longer needs to
be installed to build it. Adjust the documentation accordingly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2018-03-29 09:18:45 +02:00
Darren Stahl
84f6fce240 Make hcsshim layerwriter close a fatal error
Signed-off-by: Darren Stahl <darst@microsoft.com>
2018-03-28 18:02:45 -07:00
Justin Cormack
9435aeeb30
The set of bounding capabilities is the largest group
No capabilities can be granted outside the bounding set, so there
is no point looking at any other set for the largest scope.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-03-28 17:36:46 -07:00
Stephen Day
79963209f6
Merge pull request #2239 from estesp/fix-test-typeurl
Fix typo in metadata test typeurl string
2018-03-28 12:05:29 -07:00
Phil Estes
dd1085c922
Fix typo in metadata test typeurl string
Incorrectly spelled "containerd" in test string.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-03-28 12:35:42 -04:00
Phil Estes
fec0a1ba89
Merge pull request #2237 from dmcgowan/fix-pull-uncompressed-label
client/pull: fix label being put on snapshot instead of content
2018-03-28 12:32:28 -04:00
Phil Estes
bfa7e59cba
Merge pull request #2236 from dmcgowan/update-releases-md
Add CRI API to releases file
2018-03-28 09:27:42 -04:00
Derek McGowan
d608e3d9dc
Fix label being put on snapshot instead of content
The uncompressed label should be placed on content instead
of snapshots. Currently the uncompressed label is getting
passed into as a label option for apply, which is used to commit
snapshots. The content is already committed, but after apply
the uncompressed diff digest is verified and can be reliably used
to update the content with the label.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 17:55:35 -07:00
Derek McGowan
e0424e2c76
Add CRI API to releases file
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 16:33:47 -07:00
Derek McGowan
7833fb49fd
Merge pull request #2225 from dmcgowan/prepare-1.1.0-rc0
Prepare 1.1.0-rc.0 release
2018-03-27 09:19:04 -07:00
Derek McGowan
92198a60c5
Prepare 1.1.0-rc.0 release
Add the release notes and update release docs.
Increments version number.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-03-27 00:10:41 -07:00
Derek McGowan
ea37521fda
Merge pull request #2233 from Random-Liu/update-cri
Update cri to v1.0.0-rc.0
2018-03-27 00:06:34 -07:00
Lantao Liu
74e45c0392 Update cri validation test version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-27 05:15:14 +00:00