dilim/containerd
1
0
Fork 0
mirror of https://github.com/containerd/containerd.git synced 2026-08-12 22:16:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,301 Commits 29 Branches 315 Tags
b2d260c4f4d97bbfdf2e535ac03846f46bbaa033
Commit Graph

4301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
b2d260c4f4 Ensure labels is not nil in differ 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2019-06-14 15:46:14 +00:00
Derek McGowan
85f6aa58b8 Merge pull request #3331 from Random-Liu/1.2.7-release-note 
Prepare v1.2.7 release
v1.2.7 		2019-06-14 10:04:10 +08:00
Lantao Liu
bad4fdd766 Prepare release note for v1.2.7. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-13 13:36:36 -07:00
Michael Crosby
1bda2ed0d5 Merge pull request #3338 from dmcgowan/backport-user-agent-fix 
[release/1.2] Add user agent header to all requests
 2019-06-12 12:02:55 -04:00
Derek McGowan
1af8e6ec3c Add user agent header to all requests 
Currently the user agent is only being used on the initial
resolve request, then switching to the default user agent.
This ensures the correct user agent is always used. There is
a larger fix in progress which does this is a cleaner way, but
the scope of this change is fixing the user agent issue.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
 2019-06-12 21:54:39 +08:00
Phil Estes
71f5018395 Merge pull request #3332 from crosbymichael/cherry 
[release/1.2] differ: fix deadlock on commit error
 2019-06-10 17:17:27 -04:00
Phil Estes
ea70cd6699 Merge pull request #3330 from Random-Liu/update-cri-release-1.2 
[release/1.2] Update cri to 49ca74043390bc2eeea7a45a46005fbec58a3f88
 2019-06-10 17:16:59 -04:00
Tonis Tiigi
e4e631ad5e differ: fix deadlock on commit error 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2019-06-10 20:00:56 +00:00
Lantao Liu
dbd25c80c9 Update cri to 49ca74043390bc2eeea7a45a46005fbec58a3f88 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-06-10 10:21:43 -07:00
Michael Crosby
7c69912f5d Merge pull request #3316 from estesp/update-ttrpc 
[release/1.2] cherry-pick: Bump ttrpc
 2019-06-03 10:44:43 -04:00
Georgi Sabev
d2d36e564b Bump ttrpc 
Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
 2019-05-31 09:52:15 -04:00
Phil Estes
367c672159 Merge pull request #3283 from fuweid/cp-v1_respect_shim_debug 
[cherry-pick release/1.2] v1: Respect the `shim_debug` flag when load tasks
 2019-05-14 13:17:37 -04:00
Phil Estes
845990f873 Merge pull request #3282 from fuweid/cp-redirect-shim-v1-output 
[cherry-pick release/1.2] containerd-shim: redirect output into stdout fifo
 2019-05-14 13:16:55 -04:00
Li Yuxuan
57f79a1970 v1: Respect the shim_debug flag when load tasks 
Currently when we restart containerd it will load all tasks with shim
logs whether the `shim_debug` is set or not.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
(cherry picked from commit 66036d9206)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-14 09:13:38 +08:00
Wei Fu
5508046786 containerd-shim: redirect output into stdout fifo 
Redirect is used to make sure that containerd still can read the log of
shim after restart.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
(cherry picked from commit fbb80b9510)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-14 09:11:12 +08:00
Phil Estes
5a62161af3 Merge pull request #3273 from fuweid/cp-fifo-fd-leak 
[cherry-pick release/1.2] Fix fd leak of shim log
 2019-05-10 21:04:37 +02:00
Phil Estes
d0319ec44a Merge pull request #3274 from thaJeztah/1.2_backport_pidnamespace 
[release/1.2 backport] fix killall when use pidnamespace
 2019-05-10 21:01:54 +02:00
Lifubang
1014235c6d fix shouldKillAllOnExit check 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
(cherry picked from commit fa5f744a79)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-05-10 09:32:21 -07:00
Li Yuxuan
5cd83f397f Fix fd leak of shim log 
Open shim v2 log with the flag `O_RDWR` will cause the `Read()` block
forever even if the pipe has been closed on the shim side. Then the
`io.Copy()` would never return and lead to a fd leak.
Fix typo when closing shim v1 log which causes the `stdouLog` leak.
Update `numPipes` function in test case to get the opened FIFO
correctly.

Signed-off-by: Li Yuxuan <liyuxuan04@baidu.com>
(cherry picked from commit cf6e008542)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-10 22:59:30 +08:00
Julia Nedialkova
0717fe62c1 Use named pipes for shim logs 
Relating to issue [#2606](https://github.com/containerd/containerd/issues/2606)

Co-authored-by: Oliver Stenbom <ostenbom@pivotal.io>
Co-authored-by: Georgi Sabev <georgethebeatle@gmail.com>
Co-authored-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Co-authored-by: Danail Branekov <danailster@gmail.com>

Signed-off-by: Oliver Stenbom <ostenbom@pivotal.io>
Signed-off-by: Georgi Sabev <georgethebeatle@gmail.com>
Signed-off-by: Giuseppe Capizzi <gcapizzi@pivotal.io>
Signed-off-by: Danail Branekov <danailster@gmail.com>
(cherry picked from commit 1d4105cacf)
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2019-05-10 22:58:41 +08:00
Phil Estes
ea75cfc158 Merge pull request #3264 from Random-Liu/cherry-pick-#3244-#3263-release-1.2 
[release/1.2] Return NotFound error for kill and delete in deleted state.
 2019-05-08 12:58:12 +02:00
Lantao Liu
3d276b4b02 Fix error handling for task deletion. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-07 14:20:03 -07:00
Lantao Liu
247de3f467 Return NotFound error for kill and delete in deleted state. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-05-07 14:19:59 -07:00
Michael Crosby
3923c02491 Merge pull request #3254 from jcordasc/cherrypick-annotation-fix-1.2 
[release/1.2 backport] Add missing annotations map to Descriptor for gRPC transfer
 2019-05-07 11:40:16 -04:00
Derek McGowan
9196892f99 Merge pull request #3250 from thaJeztah/1.2_backport_bump_ttrpc 
[release/1.2 backport] Update ttrpc
 2019-05-06 15:39:37 -07:00
Stefan Berger
9ad688aaeb Extend adaptImage function with annotations case 
Extend the adaptImage function with a case for handling the annotations
so they can be used in the filter adaptors for fieldpaths.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 5d50b9c2bb)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
5538d71db3 Extend metadata images test with fieldpaths for Annotations 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 09cf2a629b)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
309e1dbeee Write the Annotations map into the bolt db 
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 5124f9ee54)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
a456958673 Prepare boltutil for reading and writing another map 
Refactor the code so that another function can also read and write maps
into the bolt db.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 02cc1485df)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
4bb9151268 Add test for ocispec.Descriptor Annotations 
Make sure that Annotations we write into ocispec.Descriptors are
written into the store and can be read back.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 79248fea2b)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
2364b03720 Copy annotations around where necessary 
Make sure that the newly added annotations are copied around appropriately.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
(cherry picked from commit 0b711d616a)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Stefan Berger
9844ce4424 Add missing annotations map to Descriptor for gRPC transfer 
Add the annotations map to the gRPC Descriptor message.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
Signed-off-by: Harshal Patil <harshal.patil@in.ibm.com>
(cherry picked from commit c6703d4c76)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-05-03 21:31:39 -05:00
Derek McGowan
502ed64d58 Merge pull request #3257 from jcordasc/jcordasc/vndr-go-mod-only 
[release/1.2] Add new required vndr go.mod files
 2019-05-03 16:26:34 -07:00
Derek McGowan
f7b8ac5941 Merge pull request #3247 from thaJeztah/1.2_bump_runc_1.0.0rc8 
[release/1.2 backport] Bump runc 1.0.0-rc8, opencontainers/selinux v1.2.2
 2019-05-03 16:25:34 -07:00
Jared Cordasco
d37c5e05f1 Add go.mod file for gopkg.in/yaml.v2 
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-04-30 19:42:10 -05:00
Sebastiaan van Stijn
79f6941d21 bump containerd/ttrpc 699c4e40d1e7416e08bf7019c7ce2e9beced4636 
full diff: f02858b145...699c4e40d1

- containerd/ttrpc#33 Fix returns error message
- containerd/ttrpc#35 Make onclose an option

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 8c5779c32b)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-29 15:25:10 -07:00
Brian Goff
5f1c66ff6c Update ttrpc to support context timeout. 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 0befa457d3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-29 15:23:00 -07:00
Sebastiaan van Stijn
05c3be6dfd bump opencontainers/selinux v1.2.2 
full diff: https://github.com/opencontainers/selinux/compare/v1.2.1...v1.2.2

- opencontainers/selinux#51 Older kernels do not support keyring labeling

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit e5aab17a0e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-27 18:03:55 -07:00
Sebastiaan van Stijn
abd5f7c0be bump runc v1.0.0-rc8 
full diff: 029124da7a...425e105d5a

- opencontainers/runc#2043 Vendor in latest selinux code for keycreate errors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit dd85aea625)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-27 18:02:53 -07:00
Phil Estes
af407fb77c Merge pull request #3235 from estesp/update-to-ms-image 
[release/1.2] cherry-pick: Convert Windows CI to use Microsoft MCR image urls
 2019-04-19 13:44:09 -04:00
Justin Terry (VM)
6bfa149b7a Convert Windows CI to use Microsoft MCR image urls 
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-04-19 09:37:55 -04:00
Phil Estes
6cdfa4930c Merge pull request #3219 from jcordasc/cherrypick-#3213-release-1.2 
[release/1.2 backport] Correct import path and PusherFunc signature
 2019-04-19 09:36:17 -04:00
Michael Crosby
b9da989b47 Merge pull request #3213 from jcordasc/small-fixes 
Correct import path and PusherFunc signature

(cherry picked from commit 8722ec03c3)
Signed-off-by: Jared Cordasco <jcordasc@coglib.com>
 2019-04-18 17:11:45 -05:00
Michael Crosby
56a655285c Merge pull request #3229 from estesp/fix-appveyor 
[release/1.2] cherry-pick: Appveyor fixes from master
 2019-04-18 14:45:21 -04:00
Wei Fu
0b2d89cc82 Fix error on pull hang in CI 
Kill the underlying containerd after outputting error. Otherwise CI
hangs indefinitely and requires the CI infrastructure to kill the build
at the timeout expiration.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-04-18 11:26:41 -04:00
Phil Estes
0b58491d02 Move to sha-specified test image for nanoserver 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2019-04-18 11:26:33 -04:00
Derek McGowan
894b81a4b8 Merge pull request #3180 from Random-Liu/1.2.6-release-note 
Prepare v1.2.6 release
v1.2.6 		2019-04-05 11:39:47 -07:00
Lantao Liu
4be9af65b9 Prepare 1.2.6 containerd release. 
Signed-off-by: Lantao Liu <lantaol@google.com>
 2019-04-05 10:43:24 -07:00
Michael Crosby
9d87dddaec Merge pull request #3183 from thaJeztah/1.2_bump_runc 
[release/1.2] bump runc to 029124da (v1.0.0-rc7-6-g029124da)
 2019-04-05 10:50:52 -04:00
Sebastiaan van Stijn
e01177391d bump runc to 029124da (v1.0.0-rc7-6-g029124da) 
no changes in vendored files

full diff: https://github.com/opencontainers/runc/compare/v1.0.0-rc7...029124da7af7360afa781a0234d1b083550f797c

- opencontainers/runc#2031 Add selinux validate in runc exec
- opencontainers/runc#2032 Fix SELinux failures on disabled SELinux Machines
- addresses opencontainers#2030 "container init caused "write /proc/self/attr/keycreate: invalid argument"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2019-04-05 10:23:05 +02:00