Commit Graph

49 Commits

Author SHA1 Message Date
Michael Crosby
713205b369 bump selinux dep
Includes fixes for the category range and mount labeling.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-06-15 15:15:35 -04:00
Sebastiaan van Stijn
0b3c7e1479
vendor: opencontainers/selinux v1.5.2
full diff: https://github.com/opencontainers/selinux/compare/v1.5.1...v1.5.2

- Implement FormatMountLabel unconditionally
  Implementing FormatMountLabel on situations built without selinux
  should be possible; the context will be ignored if no SELinux is available.
- Remote potential race condition, where mcs label is freed
  Theorectially if you do not change the MCS Label then we free it and two
  commands later reserve it. If some other process was grabbing MCS Labels
  at the same time, the other process could get the same label.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-26 16:30:35 +02:00
Derek McGowan
21ad9c4e21 Use digestset from go-digest
Removes docker/distribution dependency

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-05-11 14:17:34 -07:00
Sebastiaan van Stijn
0e1b7bdb59
Remove dependency on libcontainer/system
This swaps the RunningInUserNS() function that we're using
from libcontainer/system with the one in containerd/sys.

This removes the dependency on libcontainer/system, given
these were the only functions we're using from that package.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-10 21:58:16 +02:00
Sebastiaan van Stijn
07106ad049
vendor: runtime-spec v1.0.2
full diff: 29686dbc55...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-09 15:05:25 +02:00
Davanum Srinivas
2b162b6c11
update selinux dependency to fix test failures
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-04-15 14:59:43 -04:00
Davanum Srinivas
3d4c597bdc
Update to a released version of opencontainers/selinux (1.3.3)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-02-28 11:43:02 -05:00
Davanum Srinivas
5f0bf05239
pick up fix for CVE-2019-19921 in opencontainers/selinux
opencontainers/selinux/issues/61 has a request for a new release

Here's the full diff:
3a1f366feb...5215b1806f

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-24 13:45:40 -05:00
Davanum Srinivas
311887da35
Bump to opencontainers/runc new version - v1.0.0-rc10
We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
https://github.com/opencontainers/runc/compare/v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-01-24 09:56:50 -05:00
Lantao Liu
4e2b4aa972 Update containerd to c0c6b51179.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-10-09 18:05:20 -07:00
Lantao Liu
27de1a5862 Update containerd to 5222236c1b.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-09 10:41:46 -07:00
Lantao Liu
efba8e147f Update containerd to 2f69be5594.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-06-10 19:34:46 -07:00
Lantao Liu
bf112b3c2b Update containerd 591e52c504.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-04-05 11:39:34 -07:00
Sebastiaan van Stijn
5e7d59fc9d
bump opencontainers/selinux v1.2.1
full diff: opencontainers/selinux@v1.2...v1.2.1

brings in opencontainers/selinux#49 Ignore attempts to setLabels "" on SELinux disabled systems

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-04 09:33:38 +02:00
Sebastiaan van Stijn
7b397f0322
bump opencontainers/selinux to v1.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-29 01:33:35 +01:00
Michael Crosby
5eddc1a2cc Use container'd oci opts for spec generation
This bumps the containerd and sys packages in CRI

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Remove runtime-tools

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Update tests for oci opts package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-03-27 16:57:04 -04:00
Lantao Liu
c27a12dd08 Update containerd to 5ba368748b.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -08:00
Lantao Liu
2cc1edcfc3 Update containerd to 6937c5a3ba
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-12-04 01:53:10 -08:00
Lantao Liu
f818de9dce Update containerd to v1.2.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-11-12 11:12:41 -08:00
Lantao Liu
e3aa8adbb0 Update containerd to f88d3e5d6d.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-26 15:23:15 -07:00
Madhan Raj Mookkandy
5d777b2e35 Vendor in runtime-spec & runtime-tools from github.com/opencontainers
Signed-off-by: Madhan Raj Mookkandy <madhanm@microsoft.com>
2018-09-21 14:43:09 -07:00
Lantao Liu
f267f217cd Update containerd to 66b984ee33
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-13 16:31:32 -07:00
Lantao Liu
58eb04550d
Merge pull request #873 from miaoyq/verify-selinux-level
Verify selinux level format
2018-08-13 18:57:01 -07:00
Yanqiang Miao
a87bda08c0 update selinux to b6fa367
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2018-08-14 08:33:43 +08:00
Lantao Liu
6379fd0346 Update containerd to b9eeaa1ce8.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-08-09 01:53:44 -07:00
Filipe Brandenburger
01d77d44f5 Update github.com/opencontainers/runtime-tools to v0.6.0
Also add new dependencies on github.com/xeipuuv/gojson* (brought up by
new runtime-tools) and adapt the containerd/cri code to replace the APIs
that were removed by runtime-tools.

In particular, add new helpers to handle the capabilities, since
runtime-tools now split them into separate sets of functions for each
capability set.

Replace g.Spec() with g.Config since g.Spec() has been deprecated in the
runtime-tools API.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
2018-06-20 13:52:50 -07:00
Lantao Liu
80188e253a Update containerd to d1435e6e4d.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-05-23 10:16:33 -07:00
Lantao Liu
776929c52e Update containerd to 8a7e17ef96
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-23 23:03:00 +00:00
Mike Brown
6e1c57ec01 update runc vendor and containerd
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-02-08 19:01:48 -06:00
Lantao Liu
635e5747c0 Update containerd and leverage plugin graceful stop.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-23 22:46:46 +00:00
Lantao Liu
b07017b93e Update containerd version to 90553efdef.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-12 22:34:39 +00:00
w9n
1a6be2b573 update containerd, runc, cgroups, sys and docker version
Signed-off-by: w9n <w9ncontact@gmail.com>
2017-10-24 22:52:29 +02:00
Lantao Liu
f7eaa29c67 Update containerd to 8558b98eb1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-06 01:40:39 +00:00
Lantao Liu
21233b22be Check seccomp enable and add unit test for seccomp/apparmor.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 23:09:26 +00:00
Lantao Liu
dd967cde8c Improve apparmor and selinux support.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 20:46:31 +00:00
Lantao Liu
91ca178275 Update containerd to include the gcr private registry fix
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-18 18:19:26 +00:00
Mike Brown
8310fb4bfd update vendor
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-14 12:24:00 -05:00
Yanqiang Miao
0c3304e006 Support selinux options/label
Support selinux optios/label

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-08-31 19:20:12 +08:00
Lantao Liu
55d3abdb89 Update containerd to 360e46ddda
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-25 21:11:56 +00:00
Lantao Liu
8d1b737480 Update containerd to a6ce1ef2a1
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-24 21:47:52 +00:00
Abhinandan Prativadi
32e0313418 Containerd client integration
This commit:
1) Replaces the usage of containerd GRPC APIs with the containerd client for all operations related to containerd.
2) Updated containerd to v1.0alpha4+
3) Updated runc to v1.0.0

Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-08-16 14:43:22 -07:00
Lantao Liu
20860f2ecb Use vndr instead of godep.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-04 02:41:26 +00:00
Lantao Liu
a4f7f7127b Vendor containerd 2386062 and runtime-tools e29f3ca.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-08-02 23:21:37 +00:00
Lantao Liu
e887ef63d1 Upgrade containerd to 8ed1e24ae9.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-06-19 18:29:00 +00:00
heartlock
73fbe90c5b update vendor
Signed-off-by: heartlock <21521209@zju.edu.cn>
2017-06-09 15:42:13 +08:00
Random-Liu
48118ae086 Update godeps.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-05-16 20:47:17 +00:00
Random-Liu
1395b07183 Update godeps.
Signed-off-by: Random-Liu <lantaol@google.com>
2017-05-12 13:14:46 -07:00
Mike Brown
100870abb2 godeps update
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-05-11 19:33:57 -05:00
Random-Liu
022b25259e Update godep 2017-04-14 19:04:27 -07:00