Phil Estes
ac01f20a8e
Merge pull request #2577 from samuelkarp/stop-signal
...
ctr: make kill optionally use stop-signal
2018-09-28 12:05:56 -04:00
Michael Crosby
655ba65875
Merge pull request #2686 from jterry75/runhcs_improvements
...
Various containerd-shim-runhcs bug fixes/improvements
2018-09-28 11:19:54 -04:00
Samuel Karp
607888ce29
ctr: make kill use stop-signal by default
...
The OCI image specification includes a `StopSignal` field in the image
configuration, denoting the system call signal to be sent to the
container to exit. This commit adds a new `WithImageStopSignal` container
option that can be used for storing the `StopSignal` field as a label on
the container. This commit also adjusts `ctr run` to call
`WithImageStopSignal` and `ctr tasks kill` to send the signal stored in
that label by default.
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-09-27 15:53:38 -07:00
Samuel Karp
b392a3a8e4
signals: move ParseSignal to containerd package
...
Signed-off-by: Samuel Karp <skarp@amazon.com>
2018-09-27 15:53:38 -07:00
Phil Estes
df60d3272a
Merge pull request #2687 from dmcgowan/fix-pigz-panic
...
Fix panic when bufio Reader called in 2 goroutines
2018-09-27 12:43:09 -04:00
Justin Terry (VM)
81eb40fabf
Adds containerd-shim-runhcs verbose logging support
...
Revendors to Microsoft/hcsshim v0.7.5 that added support for logging all
runhcs.exe commands via Windows named pipes. This now launches all runhcs.exe
commands and forwards debug logging to the containerd-shim-runhcs log when
with --debug.
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
772644e978
Fixes containerd-shim-runhcs State on exec id
...
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
83437ef646
Fixes containerd-shim-runhcs Delete on exec id
...
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:09 -07:00
Justin Terry (VM)
84aa0bfde6
Forward containerd debug to shim invocation
...
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-27 07:46:01 -07:00
Michael Crosby
75d7d6e7a8
Merge pull request #2684 from dmcgowan/manifest-resolution
...
Update manifest resolution for non-index manifests
2018-09-27 10:24:47 -04:00
Derek McGowan
db358a9fd2
Fix panic when bufio Reader called in 2 goroutines
...
A panic was seen related to the buffer being reset in
one goroutine while being read in another. In the case
of pigz an early cancellation will cause the reader to
close, resetting the buffer and signaling the process
to shut down, but races since the process must stop
reading before the reset otherwise the a panic may occur.
This fix guarantees that the bufio is always reset and
returned to the pool on the same goroutine that is
doing the read. If a buffer is not fully read the
buffered reader should just be discarded and not
returned back to the pool.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-26 18:11:30 -07:00
Derek McGowan
f88d3e5d6d
Merge pull request #2685 from Random-Liu/expose-labels
...
Add `Labels()` to client.Image.
2018-09-26 10:25:42 -07:00
Lantao Liu
3d5a408bfa
Add Labels
to client.Image.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-26 00:42:13 -07:00
Derek McGowan
ef8498bf79
Update manifest resolution for non-index manifests
...
Avoid filtering manifests by platform when a non-index
manifest is provided to the Manifest function.
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-25 17:50:06 -07:00
Derek McGowan
4b1d56e240
Merge pull request #2682 from jterry75/lcow_snapshot_lock
...
Fix race in lcow snapshot scratch.vhdx creation
2018-09-25 10:04:59 -07:00
Justin Terry (VM)
e373126bfb
Fix race in lcow snapshot scratch.vhdx creation
...
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-25 09:35:46 -07:00
Michael Crosby
3bc4ba271e
Merge pull request #2681 from Starnop/typo-contianers
...
typo: fix misspells in comments of containers/contaienrs.go
2018-09-25 09:39:38 -04:00
Starnop
a121b2fb56
typo: fix misspells in comments of containers/contaienrs.go
...
Signed-off-by: Starnop <starnop@163.com>
2018-09-25 10:56:18 +08:00
Michael Crosby
87d1118a0f
Merge pull request #2605 from lifubang/runafterstart
...
fix delete running bundle dir when ctr t start a container again
2018-09-21 14:22:33 -04:00
Michael Crosby
6496078ef8
Merge pull request #2669 from estesp/fix-withuser-comment
...
Remove a TODO from the code comments that is complete
2018-09-21 14:17:23 -04:00
Michael Crosby
54447c6bfb
Merge pull request #2676 from dmcgowan/update-continuity
...
Update continuity
2018-09-21 14:16:57 -04:00
Derek McGowan
697ec5d914
Update continuity
...
Includes fs error changes
Includes removal of unreachable block
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-21 09:14:51 -07:00
Michael Crosby
b01ebaf849
Merge pull request #2674 from crosbymichael/runc
...
Update runc to 00dc70017d222b178a002ed30e9321b126
2018-09-21 10:21:24 -04:00
Derek McGowan
92d58bf8f0
Merge pull request #2670 from jterry75/runhcs_stop_success
...
runhcs-shim improvements and fixes to ctr
2018-09-20 15:43:27 -07:00
Michael Crosby
806a8f98bb
Update runc to 00dc70017d222b178a002ed30e9321b126
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 18:42:15 -04:00
Lifubang
557e8e0b0d
fix delete running bundle dir when run t start cmd again
...
Signed-off-by: Lifubang <lifubang@acmcoder.com>
code optimization after review
Signed-off-by: Lifubang <lifubang@acmcoder.com>
2018-09-21 06:33:23 +08:00
Justin Terry (VM)
547bb94e4b
Fix ctr run for Windows containers
...
1. Fixes bugs in ctr run that were introduced by 1d9b969
2. Adds support for the --isolated flag that runs Windows HyperV
cotainers instead of process isolated containers on Windows.
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-20 14:28:36 -07:00
Derek McGowan
2623241d50
Merge pull request #2671 from crosbymichael/ttrpc
...
Update ttrpc for client timeout support
2018-09-20 13:48:50 -07:00
Derek McGowan
99fc40fd60
Merge pull request #2666 from dmcgowan/update-version-1.2-rc.0
...
Update version for v1.2.0-rc.0
2018-09-20 13:30:58 -07:00
Michael Crosby
d16cc3a02e
Update ttrpc for client timeout support
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-20 15:28:52 -04:00
Derek McGowan
65e0214895
Update version for v1.2.0-rc.0
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-20 11:23:42 -07:00
Derek McGowan
7dc7c5e9ed
Update mailmap
...
Fix ordering for Xuean Yan
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-20 11:23:42 -07:00
Justin Terry (VM)
7768ab1b5e
Update runhcs-shim to use go-bindings
...
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-09-20 10:40:33 -07:00
Phil Estes
16b42fce94
Merge pull request #2653 from liyongxin/master
...
typo fix oci/typo_spec_opts_test
2018-09-20 10:07:00 -04:00
Michael Crosby
15861305e5
Merge pull request #2616 from Lihua93/master
...
Typo fix
2018-09-20 09:40:07 -04:00
Phil Estes
41615e8ded
Remove a TODO from the code comments that is complete
...
WithUser... helpers do support non-snapshot rootfs now.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-09-20 09:07:36 -04:00
Yongxin Li
03b1dae195
typo fix
...
Signed-off-by: Yongxin Li <yxli@alauda.io>
2018-09-20 10:56:42 +08:00
Lihua Tang
af23a4c1f2
fix: typo omitted -> ommitted
...
Signed-off-by: Lihua Tang <lhtang@alauda.io>
2018-09-20 10:30:30 +08:00
Derek McGowan
308d3cb60e
Merge pull request #2665 from dmcgowan/update-mailmap
...
Update mailmap
2018-09-19 14:59:50 -07:00
Derek McGowan
9faeea1e5e
Merge pull request #2649 from estesp/nonewpriv-flag
...
Add flag to ctr for running with "NoNewPrivileges: false"
2018-09-19 11:17:05 -07:00
Michael Crosby
b38b4427f6
Merge pull request #2640 from mxpv/pgzip
...
Support parallel decompression (pigz)
2018-09-19 13:58:16 -04:00
Phil Estes
7141ea3c0e
Merge pull request #2664 from crosbymichael/proc
...
Add nosuid,noexec,nodev to proc
2018-09-19 13:55:30 -04:00
Derek McGowan
5600adc86d
Merge pull request #2663 from crosbymichael/publish
...
Reduce publish connection timeout
2018-09-19 10:51:55 -07:00
Derek McGowan
4d0e744d17
Update mailmap
...
Add consistent contributor names and emails
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-09-19 10:46:02 -07:00
Michael Crosby
94c33d4f94
Add nosuid,noexec,nodev to proc
...
This is to match the same mount options as the host.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-19 13:29:56 -04:00
Michael Crosby
1ad49689d3
Reduce publish connection timeout
...
Fixes #2662
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-09-19 11:21:40 -04:00
Phil Estes
1ac5ac652b
Merge pull request #2633 from dmcgowan/import-docker
...
Support importing docker images
2018-09-19 09:52:47 -04:00
Maksym Pavlenko
e8fac24e7b
Remove decompression benchmark, use sync.Once for initialization
...
Benchmark gist: https://git.io/fASMy
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2018-09-18 17:09:12 -07:00
Michael Crosby
3c2668dce4
Merge pull request #2661 from Random-Liu/update-release-note
...
Update v1.2.0-rc release note.
2018-09-18 15:41:36 -04:00
Lantao Liu
2da1358f86
Update v1.2.0-rc release note.
...
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-09-18 10:27:33 -07:00