github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,017 Commits 3 Branches 2 Tags 112 MiB
f8538b5e12
Commit Graph

9017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
362b7167a7
vendor: update cri (no more libseccomp cgo dependency) 
8448b92d23...8871d5cdf8

The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-31 14:32:08 +09:00
Wei Fu
8871d5cdf8
Merge pull request #1548 from AkihiroSuda/remove-libseccomp-dependency 
remove libseccomp cgo dependency
 2020-07-30 23:30:04 +08:00
Wei Fu
df8352f1ff
Merge pull request #4335 from ktock/sn-doc 
Add doc about snapshotter based on shared remote storage
 2020-07-30 23:19:59 +08:00
Wei Fu
4a96be9795
Merge pull request #4431 from TBBle/import_manifest_for_test_binary 
Import Windows manifest into test build, rather than copying by script
 2020-07-30 23:13:15 +08:00
Michael Crosby
fa1220fce3
Merge pull request #4436 from tonistiigi/tokenscopes-public 
remotes: mark GetTokenScopes public
 2020-07-30 11:07:46 -04:00
Akihiro Suda
7332e2ad2e
remove libseccomp cgo dependency 
The CRI plugin was depending on libseccomp cgo dependency via
libseccomp-golang via libcontainer.

https://github.com/seccomp/libseccomp-golang/blob/v0.9.1/seccomp_internal.go#L17

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-30 18:51:23 +09:00
Tonis Tiigi
03b5a053ea remotes: mark GetTokenScopes public 
Authorizer interface can’t be really implemented because
scopes are passed in on a side channel via private value in context.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2020-07-29 23:01:36 -07:00
Akihiro Suda
779ef60231
Merge pull request #4435 from tao12345666333/update-runc 
vendor runc library to v1.0.0-rc91-48-g67169a9d
 2020-07-30 13:10:51 +09:00
Yikun Jiang
b43a01a221 Change nodeset to ubuntu-xenial-arm64-openlab 
The old nodeset is unstable and apt source is unavailable, we change the nodeset from `ubuntu-xenial-arm64` to `ubuntu-xenial-arm64-openlab` to enable stable new nodeset.

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
 2020-07-30 09:22:38 +08:00
Mike Brown
858a766264
Merge pull request #1547 from mikebrow/containerd-list-podid-should-search 
adds support for pod id lookup for filter
 2020-07-29 17:39:18 -05:00
Mike Brown
8a2d1cc802 adds support for pod id lookup for filter 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-07-29 15:23:22 -05:00
Derek McGowan
c2a6f180d7
Merge pull request #4428 from thaJeztah/bump_continuity 
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
 2020-07-29 12:33:31 -07:00
Derek McGowan
d4b17275d6
Merge pull request #4384 from AkihiroSuda/deprecate-legacy-shims 
Deprecate legacy shims
 2020-07-29 11:30:09 -07:00
Akihiro Suda
04b98bb0ee
Deprecate legacy shims 
Fix #4365

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-30 01:57:12 +09:00
Mike Brown
c209d013cb
Merge pull request #1545 from ktock/ssdoc 
Add description about `disable_snapshot_annotations` to configuration doc
 2020-07-29 11:48:30 -05:00
Mike Brown
fe9bb8da65
Merge branch 'master' into ssdoc 2020-07-29 11:44:10 -05:00
Mike Brown
63400c7694
Merge pull request #1543 from ktock/discard-content 
Allow GC to discard content after successful pull and unpack
 2020-07-29 11:39:28 -05:00
Derek McGowan
40b22ef074
Merge pull request #4429 from crosbymichael/task-spec 
Add Spec() method to task
 2020-07-29 09:35:37 -07:00
Akihiro Suda
9a3e95d351
Merge pull request #4430 from crosbymichael/ctr-cpus 
Add --cpus flag to ctr
 2020-07-30 01:27:00 +09:00
Jintao Zhang
b870231854 vendor runc library to v1.0.0-rc91-48-g67169a9d 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
 2020-07-29 14:52:48 +08:00
Michael Crosby
02afa94256 Add --cpus flag to ctr 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-28 23:06:07 -04:00
Paul "TBBle" Hampson
aa56cfc0a8 Import Windows manifest into test build, rather than copying by script 
This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-29 06:02:35 +10:00
Phil Estes
eb6354a118
Merge pull request #4427 from TBBle/test_improvements 
Some small test improvements
 2020-07-28 14:36:44 -04:00
Akihiro Suda
0f99e0f53e
Merge pull request #1542 from sachaos/master 
Update config syntax in registry.md (GCR example)
 2020-07-29 02:30:20 +09:00
Sebastiaan van Stijn
5b1627410d
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165 
full diff: d3ef23f19f...efbc4488d8

Fix sameFile() to recognize empty files as the same
  - fixes "Empty files can diff as "modified" even when they're not"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-07-28 16:39:35 +02:00
Paul "TBBle" Hampson
1ec1e9eabf Add Windows 10/Windows Server 2004 for integration tests 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-28 22:36:00 +10:00
Paul "TBBle" Hampson
faa4ff56e4 Usefully fail tests with unknown or bad Windows Build version 
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-28 22:35:33 +10:00
Paul "TBBle" Hampson
3795dd41ae Always report server log from verbose integration test runs 
If you're adding `-v` to TESTFLAGS, you probably want to see the server
logs, as well as the extra output from the testing framework.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
 2020-07-28 22:33:59 +10:00
Takumasa Sakao
4c8164bccf Specify version = 2 & fix wrong key in registry.md (GCR example) 
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
 2020-07-28 17:54:12 +09:00
Michael Crosby
4318f93f9c Add Spec() method to task 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-27 21:32:15 -04:00
ktock
375dd76255 Add description about disable_snapshot_annotations to configuration doc 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-07-28 09:30:20 +09:00
ktock
c80660b82b Allow GC to discard content after successful pull and unpack 
This commit adds a config flag for allowing GC to clean layer contents up after
unpacking these contents completed, which leads to deduplication of layer
contents between the snapshotter and the contnet store.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-07-28 09:05:47 +09:00
ktock
b51177bfcc Vendor containerd d184a0a343 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-07-27 10:48:20 +09:00
Akihiro Suda
d184a0a343
Merge pull request #4414 from dmcgowan/discard-content 
Set content labels based on content type
 2020-07-24 16:31:46 +09:00
Derek McGowan
67f19bfdd8
Merge pull request #4388 from AkihiroSuda/fix-mount-wait-no-child-processes 
mount: retry executing the helper binary on ECHILD
 2020-07-23 23:20:16 -07:00
Mike Brown
3c2a77bd79
Merge pull request #4421 from crosbymichael/selinux-range 
update cri to 8448b92d23
 2020-07-23 16:54:13 -05:00
Derek McGowan
cf99e16cd0
Merge pull request #4420 from mikebrow/cni-config-update 
update for CI warning
 2020-07-23 14:53:40 -07:00
Michael Crosby
3611efdcef update cri to 8448b92d23 
This includes an update of the selinux package and the ability in the CRI
configuration to set the upper bounds for the selinux category labels that are
generated.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-07-23 17:11:18 -04:00
Mike Brown
8448b92d23
Merge pull request #1534 from crosbymichael/selinux-range 
Update selinux pkg and allow category range to be set in config
 2020-07-23 15:32:55 -05:00
Mike Brown
1b320bcc26 update for cni config 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-07-23 13:41:14 -05:00
Mike Brown
0443a13da7
Merge pull request #1535 from lumjjb/updatecri-doc 
Update doc cri plugin convention
 2020-07-23 11:18:44 -05:00
Mike Brown
e080f84537
Merge pull request #1539 from mikebrow/windows-ci-force-bash 
switching to windows-2016.. latest is breaking due to wsl conflict with bash
 2020-07-23 10:11:13 -05:00
ktock
c2081369c5 Add doc about remote snapshotter 
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-07-23 13:05:05 +09:00
Mike Brown
fad87288f8 switching to windows-2016 latest is breaking due to wsl conflict with bash 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-07-22 17:33:45 -05:00
Brandon Lum
f93b72530f Update doc cri plugin convention 
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
 2020-07-22 17:34:17 +00:00
Akihiro Suda
403dc83a29
mount: retry executing the helper binary on ECHILD 
`exec.CombinedOutput()` intermittently returns `ECHILD` due to our
signal handling.

`wait(2)`: https://man7.org/linux/man-pages/man2/wait.2.html

> ECHILD (for waitpid() or waitid()) The process specified by pid
>   (waitpid()) or idtype and id (waitid()) does not exist or is
>   not a child of the calling process.  (This can happen for
>   one's own child if the action for SIGCHLD is set to SIG_IGN.
>   See also the Linux Notes section about threads.)

Fix #4387

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-07-22 14:24:08 +09:00
Wei Fu
1a571fcf1b
Merge pull request #4374 from kzys/suspend-devmapper 
snapshots/devmapper: suspend a device to avoid data corruption
 2020-07-22 11:36:31 +08:00
Wei Fu
59e1aa963f
Merge pull request #4407 from AkihiroSuda/cri-20200720 
vendor: update containerd/cri
 2020-07-22 11:20:43 +08:00
Wei Fu
2cc2414ec5
Merge pull request #4412 from cpuguy83/shim2_event_cancelled 
shim: move event context timeout to publsher
 2020-07-22 11:14:54 +08:00
Maksym Pavlenko
97c081c84b
Merge pull request #4410 from TBBle/minor_windows_fixes 
Minor fixes around Windows network setup
 2020-07-21 15:26:18 -07:00