github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,778 Commits 3 Branches 2 Tags 112 MiB
498eebe860
Commit Graph

8778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Brown
c6c9268eb0
Merge pull request #1450 from yylt/add-scheme-endpoint 
add default scheme when mirrors no scheme
 2020-04-17 12:00:48 -05:00
yang yang
d07f7f167a add default scheme if endpoint no scheme 
Signed-off-by: yang yang <yang8518296@163.com>
 2020-04-17 23:33:28 +08:00
Akihiro Suda
d8506bfd7b
Merge pull request #4193 from ktock/bump_cri 
vendor: update containerd/cri 61b7af7564
 2020-04-17 16:36:18 +09:00
ktock
e79d666cdd vendor: update containerd/cri 61b7af7564 
full diff: 92cb4ed978..61b7af7564

This adds new dependency github.com/fsnotify/fsnotify since 4ce334aa49

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-17 12:31:30 +09:00
Mike Brown
61b7af7564
Merge pull request #1446 from mikebrow/remove-travis 
have moved these tests to github actions
 2020-04-16 18:56:49 -05:00
Mike Brown
27f911d663 removes the error when tls is configured for https but http is tried first 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 13:23:56 -05:00
Mike Brown
3fc5a909d1 have moved these tests to github actions 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 12:17:21 -05:00
Mike Brown
7ccd3f7d7e
Merge pull request #1431 from ktock/stargz 
Enable to pass additional handler on pull for stargz-based remote snapshots
 2020-04-16 12:02:02 -05:00
Derek McGowan
aa6a66b65e
Merge pull request #4192 from estesp/disable-travis-on-master 
Disable Travis CI on master
 2020-04-16 09:04:57 -07:00
Phil Estes
61597b4317
Disable Travis CI on master 
This allows Travis to continue running on PRs for release/1.x branches
where we have not enabled GH Actions.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-16 11:10:08 -04:00
ktock
c1b7bcf395 Enable to pass additional handler on pull for stargz-based remote snapshots 
Throughout container lifecycle, pulling image is one of the time-consuming
steps. Recently, containerd community started to tackle this issue with
stargz-based remote snapshots, as a non-core
subproject(https://github.com/containerd/stargz-snapshotter).

This snapshotter is implemented as a standard proxy plugin but it requires the
client to pass some additional information (image ref and layer digest) for each
pull operation to query layer contents on the registry. Stargz snapshotter
project provides an image handler to do this and stargz snapshot users need to
pass this handler to containerd client.

This commit enables to use stargz-based remote snapshots through CRI by passing
the handler to containerd client on pull operation.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-16 20:53:52 +09:00
Wei Fu
45f0e21d2c
Merge pull request #1445 from mikebrow/move-travis-to-github-actions 
adds git hub actions for linux CI
 2020-04-16 12:28:49 +08:00
Chethan Suresh
7fc8652e32 Add OCI annotations for container name 
Along with type(Sandbox or Container) and Sandbox name annotations
provide support for additional annotation:
  - Container name

This will help us perform per container operation by comparing it
with pass through annotations (eg. pod metadata annotations from K8s)

Signed-off-by: Chethan Suresh <Chethan.Suresh@sony.com>
 2020-04-16 07:14:58 +05:30
Mike Brown
67de3e4ccf adds git hub actions for linux CI 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 17:25:10 -05:00
Mike Brown
68a84f7878
Merge pull request #1438 from zhsj/use-containerd-reference 
Replace docker/distribution/reference with containerd/reference/docker
 2020-04-15 14:58:43 -05:00
Mike Brown
6e980b9efd
Merge pull request #1443 from dims/build-runc-with-selinux-support 
Build runc with selinux support
 2020-04-15 14:43:42 -05:00
Michael Crosby
327c92f7d7
Merge pull request #4189 from estesp/actions-fixes 
Small fixes to our Actions CI workflow
 2020-04-15 15:42:25 -04:00
Shengjing Zhu
4cee89baf5 Update vendor after dropping depends distribution/reference 
Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2020-04-16 03:30:43 +08:00
Shengjing Zhu
4263229a7b Replace docker/distribution/reference with containerd/reference/docker 
Since https://github.com/containerd/containerd/pull/3728
The docker/distribution/reference package is copied into containerd core

Signed-off-by: Shengjing Zhu <i@zhsj.me>
 2020-04-16 03:29:58 +08:00
Phil Estes
74ceb35f50
Small fixes to our Actions CI workflow 
Integration tests were running with latest Go release rather than the
version used everywhere else. Also, we don't need to install protoc from
tarball and also apt-get the package for Ubuntu when used as a
dependency for criu build.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-15 15:19:01 -04: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
e4ad53f2c2
Build runc with selinux support 
docker-ce seems to be building runc with selinux support, let us follow
the same pattern here please:
https://github.com/docker/docker-ce/search?p=1&q=RUNC_BUILDTAGS&unscoped_q=RUNC_BUILDTAGS

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-15 14:59:42 -04:00
Mike Brown
d531dc492a
Merge pull request #1405 from fuweid/me-async-load-cnicnf 
reload cni network config if has fs change events
 2020-04-15 13:57:32 -05:00
Mike Brown
3d250b8289
Merge pull request #1439 from mikebrow/fix-selinux-unit-test 
fixes bad unit test when selinux is enabled
 2020-04-15 13:54:19 -05:00
Mike Brown
8b6377bad8
Merge pull request #1442 from containerd/mikebrow-add-greeting-action 
Create greetings.yml
 2020-04-15 13:45:34 -05:00
Mike Brown
4a9fa22683
Merge pull request #1441 from dims/run-test-in-windows 
Running critest under windows using github action
 2020-04-15 13:45:10 -05:00
Davanum Srinivas
5c31c7591e
Running critest under windows using github actions 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-15 14:09:41 -04:00
Mike Brown
aa9b1885b5 fixes bad unit tests when selinux is enabled 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 12:28:11 -05:00
Mike Brown
7381f31b36 Create greetings.yml 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-15 11:59:24 -05:00
Michael Crosby
9441507fd2
Merge pull request #4183 from dims/build-runc-with-selinux-support 
Build runc with selinux support
 2020-04-14 20:40:25 -04:00
Davanum Srinivas
7a252f3ca1
Build runc with selinux support 
docker-ce seems to be building runc with selinux support, let us follow
the same pattern here please:
https://github.com/docker/docker-ce/search?p=1&q=RUNC_BUILDTAGS&unscoped_q=RUNC_BUILDTAGS

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-14 15:24:31 -04:00
Phil Estes
ccaf35b01c
Merge pull request #4188 from estesp/fix-proto-gen 
Fix protobuild and CI check protos
 2020-04-14 15:06:50 -04:00
Phil Estes
041545cd6a
Fix protobuild and CI check protos 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-14 14:31:43 -04:00
Phil Estes
9bd3bf9bec
Merge pull request #4185 from estesp/badges 
Use GH Actions CI status for badge
 2020-04-13 13:25:19 -04:00
Phil Estes
e3bc5c487a
Use GH Actions CI status for badge 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-13 12:43:46 -04:00
Michael Crosby
2ed8d12bb0
Merge pull request #3845 from fahedouch/v2_shim_test 
v2 runtime shim test
 2020-04-13 12:26:05 -04:00
Michael Crosby
842b1e3b0b
Merge pull request #4184 from dims/cri-plugin-needs-selinux-tag 
CRI plugin needs selinux tag as well
 2020-04-13 10:58:15 -04:00
Davanum Srinivas
49200a1dd4
CRI plugin needs selinux tag as well 
A simple `grep selinux_stub bin/containerd` shows that we are not using
selinux tag when building containerd. The CRI plugin pulls in a bunch of
selinux related code, so we need to enable this tag as well.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-04-13 09:29:07 -04:00
Akihiro Suda
3282a1c14c
Merge pull request #4175 from thaJeztah/more_go_bumps 
CI: Some Go 1.13.10 updates that were missed
 2020-04-11 08:50:31 +09:00
Maksym Pavlenko
b116bcd9b3
Merge pull request #4176 from stevvooe/valdiate-digest-before-disk 
content/local: validate digest before calculating path
 2020-04-10 14:26:52 -07:00
Derek McGowan
2201007dc2
Merge pull request #4179 from fuweid/update-release12-status 
RELEASES.md: update release1.2 status
 2020-04-10 10:37:05 -07:00
Wei Fu
d97cca47ee RELEASES.md: update release1.2 status 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-11 00:27:32 +08:00
Stephen Day
4615111ba2
content/local: validate digest before calculating path 
Signed-off-by: Stephen Day <stephen.day@getcruise.com>
 2020-04-09 17:37:47 -07:00
Sebastiaan van Stijn
a6828e8c39
CI: Some Go 1.13.10 updates that were missed 
This file was still on Go 1.13.8, which caused it to be
missed when updating Go 1.13.9 to 1.13.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-09 23:33:50 +02:00
Phil Estes
a31f5e46e0
Merge pull request #4169 from thaJeztah/bump_golang_1.13.10 
Bump Golang 1.13.10
 2020-04-09 17:14:34 -04:00
Sebastiaan van Stijn
7da1e13b5d
Bump Golang 1.13.10 
go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime,
os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker
for details:

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

full diff: https://github.com/golang/go/compare/go1.13.9...go1.13.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-04-09 22:03:48 +02:00
Phil Estes
069ce2389a
Merge pull request #4160 from atlassian-forks/forkmount-use-pipe-instead-wait4 
sys/mount_linux: use pipe for communicating mount result
 2020-04-09 11:54:53 -04:00
Haitao Li
35c14c6b56 sys/mount_linux: use pipe for communicating mount result 
forkAndMountat forks a process to chdir then mount layers. Signals are
blocked (using runtime_beforeFork) during fork.

There is a race condition that the child process finishes before the
parent process is scheduled and can unblock signal handling. The SIGCHLD
signal sent from the finished process may have been delivered to the
shim process's reaper thread and caused the parent process fail with
ECHLD error.

This patch sets up a pipe for communication between child and parent
instead of waiting for child exit status.

Fixes #4009.

Signed-off-by: Haitao Li <hli@atlassian.com>
 2020-04-09 09:50:41 +10:00
Phil Estes
5957849544
Merge pull request #4162 from mxpv/log-fix 
Rework shim logger shutdown process
 2020-04-08 13:14:16 -04:00
Phil Estes
660bc71393
Merge pull request #4165 from dims/update-to-selinux-1.5.1 
Update to selinux 1.5.1
 2020-04-08 11:43:13 -04:00