github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
6,084 Commits 3 Branches 2 Tags 112 MiB
60fa35f11e
Commit Graph

6084 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Akihiro Suda
af131d7258 cgroup2 CI 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-05-22 01:15:12 +09:00
Derek McGowan
1c58c5d440
Merge pull request #4277 from lucaskanashiro/fix-build-on-riscv64 
riscv64 arch does not support -buildmode=pie
 2020-05-20 12:46:50 -07:00
Lucas Kanashiro
e34bf08e58 riscv64 arch does not support -buildmode=pie 
Signed-off-by: Lucas Kanashiro <lucas.kanashiro@canonical.com>
 2020-05-20 16:28:10 -03:00
Derek McGowan
7ef3c0f47d
Merge pull request #4275 from estesp/fix-image-usage 
Fix image usage calculation error
 2020-05-20 08:35:05 -07:00
Phil Estes
0c9b05fa60
Fix image usage calculation error 
Including snapshotter usage in total calculation should be gated by the
option `snapshotter` boolean.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-20 08:44:05 -04:00
Derek McGowan
84619ee998
Fix configurations with no server provided 
When a server is specified at the top level, there is a bug
that prevents the keys from being checked properly.
When no server is provided, the server attempts to parse
with an empty host, leaving partial values and a defaulted
skip verify configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-19 19:16:50 -07:00
Derek McGowan
06b0cd45ba
Fix nil pointer errors 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-19 19:16:39 -07:00
Phil Estes
4e08c2de67
Merge pull request #4269 from KentaTada/remove-unused-syscall 
seccomp: remove the unused query_module(2)
 2020-05-19 11:14:31 -04:00
Kenta Tada
03755821d2 seccomp: remove the unused query_module(2) 
query_module(2) is only in kernels before Linux 2.6.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
 2020-05-19 10:36:55 +09:00
Phil Estes
d7c4bda3b1
Merge pull request #4264 from thaJeztah/seccomp_allow_clock_adjtime 
seccomp: Whitelist `clock_adjtime`
 2020-05-18 09:36:08 -04:00
Phil Estes
0f2b15b7af
Merge pull request #4261 from gaurav1086/fix_docker_data_race 
docker: fix data race on err
 2020-05-18 09:34:04 -04:00
Phil Estes
0814750023
Merge pull request #4262 from gaurav1086/fix_data_race_in_unpacker 
unpacker: Fix data race and possible data corruption
 2020-05-18 09:32:24 -04:00
Phil Estes
49db7dfcfb
Merge pull request #4260 from thaJeztah/bump_golang_1.13.11 
Bump Golang 1.13.11
 2020-05-18 09:24:14 -04:00
Stanislav Levin
5765991f2c
seccomp: Whitelist clock_adjtime 
This only allows making the syscall. CAP_SYS_TIME is still required
for time adjustment (enforced by the kernel):

```
kernel/time/posix-timers.c:

1112 SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
1113                 struct __kernel_timex __user *, utx)
...
1121         err = do_clock_adjtime(which_clock, &ktx);

1100 int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx)
1101 {
...
1109         return kc->clock_adj(which_clock, ktx);

1299 static const struct k_clock clock_realtime = {
...
1304         .clock_adj              = posix_clock_realtime_adj,

188 static int posix_clock_realtime_adj(const clockid_t which_clock,
189                                     struct __kernel_timex *t)
190 {
191         return do_adjtimex(t);

kernel/time/timekeeping.c:

2312 int do_adjtimex(struct __kernel_timex *txc)
2313 {
...
2321         /* Validate the data before disabling interrupts */
2322         ret = timekeeping_validate_timex(txc);

2246 static int timekeeping_validate_timex(const struct __kernel_timex *txc)
2247 {
2248         if (txc->modes & ADJ_ADJTIME) {
...
2252                 if (!(txc->modes & ADJ_OFFSET_READONLY) &&
2253                     !capable(CAP_SYS_TIME))
2254                         return -EPERM;
2255         } else {
2256                 /* In order to modify anything, you gotta be super-user! */
2257                 if (txc->modes && !capable(CAP_SYS_TIME))
2258                         return -EPERM;

```

Fixes: moby/moby 40919
Signed-off-by: Stanislav Levin <slev@altlinux.org>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-17 23:11:04 +02:00
Gaurav Singh
db74d3115e unpacker: Fix data race and possible data corruption 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 2020-05-17 10:55:52 -04:00
Gaurav Singh
2325182529 docker: fix data race on err 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 2020-05-17 09:20:38 -04:00
Sebastiaan van Stijn
d07a71b97f
Bump Golang 1.13.11 
full diff: https://github.com/golang/go/compare/go1.13.10...go1.13.11

go1.13.11 (released 2020/05/14) includes fixes to the compiler. See the Go 1.13.11
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.11+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-16 14:57:04 +02:00
Maksym Pavlenko
b7cf3c68e7
Merge pull request #4258 from estesp/codeql 
Add CodeQL Analysis workflow
 2020-05-15 10:05:21 -07:00
Phil Estes
0207b7ff0e
Enable running CodeQL on PRs that modify Action 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-15 12:51:48 -04:00
Phil Estes
5425067e8f
Merge pull request #4256 from mxpv/nightly_pr 
Trigger nightly builds on pull reuqest events
 2020-05-15 12:38:26 -04:00
Justin Hutchings
1a06884f18
Add CodeQL Analysis workflow 
Signed-off-by: Justin Hutchings <jhutchings1@github.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-15 10:15:46 -04:00
Maksym Pavlenko
563964e9d5 Trigger nightly builds on pull reuqest events 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
 2020-05-14 18:39:32 -07:00
Wei Fu
6312b52de5
Merge pull request #4245 from thaJeztah/remove_deprecated_dualstack 
ConfigureHosts: remove deprecated DualStack option
 2020-05-15 08:00:03 +08:00
Derek McGowan
32985949d4
Merge pull request #4242 from dmcgowan/1.4-beta 
Add release notes for 1.4 beta
 2020-05-14 16:20:50 -07:00
Derek McGowan
77ab0104e2
Add release notes for 1.4 beta 
Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-14 13:04:02 -07:00
Maksym Pavlenko
7fd23fe143
Merge pull request #4254 from thaJeztah/bump_go_digest 
vendor: opencontainers/go-digest v1.0.0
 2020-05-14 11:42:16 -07:00
Sebastiaan van Stijn
6eeed18cb4
vendor: opencontainers/go-digest v1.0.0 
full diff: 28d3ccc31a...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-14 18:49:49 +02:00
Derek McGowan
7207226e9d
Merge pull request #4253 from estesp/no-codecov-comment 
Set codecov to not comment on PRs
 2020-05-13 07:32:25 -07:00
Phil Estes
7cdacdda81
Set codecov to not comment on PRs 
Until we totally remove codecov, this will keep it from commenting on
PRs but reports will still be available on codecov.io

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-05-13 09:19:42 -04:00
Phil Estes
f13ba8f2f2
Merge pull request #4247 from thaJeztah/bump_continuity 
vendor: containerd/continuity, containerd/fifo, containerd/go-runc
 2020-05-12 10:41:02 -04:00
Phil Estes
65df60b3c9
Merge pull request #4251 from thaJeztah/bump_cri 
vendor: update containerd/cri, remove "docker/distribution" dependency
 2020-05-12 09:49:22 -04:00
Sebastiaan van Stijn
3e7bbb8a49
vendor: update containerd/cri, remove "docker/distribution" dependency 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-12 15:00:51 +02:00
Akihiro Suda
6038423bdd
Merge pull request #4250 from milkwine/master 
doc: update example about task in README.md
 2020-05-12 21:05:21 +09:00
milkwine
9898dc2a64 Code about task in "README.md" is out of date 
Signed-off-by: SiYu Zhao <d.chaser.zsy@gmail.com>
 2020-05-12 16:15:13 +08:00
Sebastiaan van Stijn
f09e999099
vendor: containerd/go-runc 7016d3ce2328dd2cb1192b2076ebd565c4e8df0c 
full diff: a5c2862aed...7016d3ce23

- add go.mod
- Parse runc version even if commit is missing

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:13:39 +02:00
Sebastiaan van Stijn
d9d1d5b624
vendor: containerd/fifo f15a3290365b9d2627d189e619ab4008e0069caf 
full diff: bda0ff6ed7...f15a329036

- add go.mod
- replace "golang.org/x/net/context"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:11:33 +02:00
Sebastiaan van Stijn
c5078a5b72
vendor: containerd/continuity d3ef23f19fbb106bb73ffde425d07a9187e30745 
full diff: 0ec596719c...d3ef23f19f

- fs: support for OpenBSD
- sysx/xattr: fix and improve
- remove Windows' Readlink fork

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 23:02:40 +02:00
Phil Estes
04985039ce
Merge pull request #4214 from payall4u/bugfix-check-not-exist 
Transfer error to ErrNotFound when kill a not exist container
 2020-05-11 10:25:02 -04:00
Phil Estes
f03fc406ab
Merge pull request #4246 from thaJeztah/bump_cri 
vendor: update containerd/cri to current master
 2020-05-11 10:01:47 -04:00
payall4u
b437938d2f
Transfer error to ErrNotFound when kill a not exist container, also add 
test case.

Signed-off-by: payall4u <404977848@qq.com>

Add integration test case

Signed-off-by: payall4u <404977848@qq.com>
 2020-05-11 21:53:43 +08:00
Sebastiaan van Stijn
2c77dc63a4
vendor: update containerd/cri to current master 
- Remove dependency on libcontainer/system
- Get rid of socat for port forwarding
- Roll docker/distribution back to latest (v2.7.1) release
  Now that 901bcb2231 was merged in containerd,
  we no longer depend on the ParseDockerRef utility from docker/distribution,
  so we can safely roll back to the latest release for this dependency.
- vendor: kubernetes v1.18.2
  Fix client watch reestablishment handling of client-side timeouts
- Add config flag to default empty seccomp profile

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-11 09:09:39 +02:00
Sebastiaan van Stijn
a4f8be1d43
vendor: kubernetes v1.18.2 
Fix client watch reestablishment handling of client-side timeouts

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-10 14:44:22 +02:00
Sebastiaan van Stijn
0d198fd096
vendor: roll docker/distribution back to latest (v2.7.1) release 
Now that 901bcb2231 was merged in containerd,
we no longer depend on the ParseDockerRef utility from docker/distribution,
so we can safely roll back to the latest release for this dependency.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-10 14:44:19 +02:00
Sebastiaan van Stijn
1b9640496e
ConfigureHosts: remove deprecated DualStack option 
The `DualStack` option was deprecated in Go 1.12, and is now enabled by default
(through commit github.com/golang/go@efc185029bf770894defe63cec2c72a4c84b2ee9).

> The Dialer.DualStack field is now meaningless and documented as deprecated.
>
> To disable fallback, set FallbackDelay to a negative value.

The default `FallbackDelay` is 300ms; to make this more explicit, this patch
sets `FallbackDelay` to the default value.

Note that Docker Hub currently does not support IPv6 (DNS for registry-1.docker.io
has no AAAA records, so we should not hit the 300ms delay).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-05-10 12:31:58 +02:00
Wei Fu
83084c9328
Merge pull request #4244 from dmcgowan/tagged-vendors 
Use tagged versions in vendor file
 2020-05-09 08:56:53 +08:00
Derek McGowan
f5c5c08bed
Merge pull request #4243 from AkihiroSuda/remove-beta-release-notes 
remove releases/*-beta.toml
 2020-05-08 17:40:49 -07:00
Derek McGowan
e9e765d6e5
Use tagged versions in vendor file 
Reverts change from tagged versions to sha.
Removes tag ambiguity on what version a sha points to when multiple tags available.
Makes comparing versions from previous releases more straight forward, without parsing potentially incorrect comment.
Fixes sync issue between tag in comment and sha, the selinux comment was incorrect here.
Updates reflect2 library to correctly tagged version, includes global variable fix.

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2020-05-08 17:11:08 -07:00
Akihiro Suda
bd3210d29e remove releases/*-beta.toml 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-05-09 09:10:17 +09:00
Maksym Pavlenko
c80284d4b5
Merge pull request #4241 from crosbymichael/update-ttrpc-typeurl 
Update ttrpc/typeurl to v1.0.1
 2020-05-08 14:04:49 -07:00
Michael Crosby
d5d94afd08
Merge pull request #4238 from thaJeztah/what_is_the_cause 
Replace errors.Cause() with errors.Is()
 2020-05-08 14:33:57 -04:00