Commit Graph

4408 Commits

Author SHA1 Message Date
John Howard
e0d7ed12a5 Windows: Enable ETW logging
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-21 14:16:44 -08:00
John Howard
fd6ac5d026 Vendor sirupsen/logrus@1.3.0
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-20 20:18:14 -08:00
Akihiro Suda
58dc0677b4
Merge pull request #3030 from veerun14/venuvvul/add-comments-fix-typos
fixing typo and added a missing comment.
2019-02-19 12:32:12 +09:00
Veeraiah Chowdary Nuvvula
f6ac73d71e fixing typo and added a missing comment.
Signed-off-by: Veeraiah Chowdary Nuvvula <venuvvul@microsoft.com>
2019-02-18 14:13:02 -08:00
Michael Crosby
ee916fe33c
Merge pull request #3025 from fuweid/bugfix_merge_label
metadata: merge snapshot labels with metadata's labels
2019-02-18 11:39:02 -05:00
Phil Estes
480bf65ae8
Merge pull request #3010 from dmcgowan/pull-add-handler-wrap
Add image handler wrapper
2019-02-18 10:14:36 -05:00
Phil Estes
06ff5ef01a
Merge pull request #3024 from jhowardmsft/jjh/signalname
Windows: Update stackdump event name
2019-02-18 10:14:12 -05:00
Wei Fu
4b3e0a8aaa metadata: merge snapshot labels with metadata's labels
fix the no-op issue.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-02-18 16:11:12 +08:00
John Howard
88f19a90a8 Windows: Update stackdump event name
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-15 15:33:29 -08:00
Phil Estes
a378dbc2ab
Merge pull request #3020 from dmcgowan/update-supported-releases
Update supported versions
2019-02-14 13:57:06 -08:00
Michael Crosby
a485eb74a3
Merge pull request #3021 from estesp/update-release-docs
Add website update to release process
2019-02-14 14:38:24 -05:00
Phil Estes
a6f43b549e
Add website update to release process
Update release process with step to get downloads list updated on
containerd.io website

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-02-14 14:01:00 -05:00
Derek McGowan
17b2c84989
Update supported versions
Use latest 1.1 and 1.2 version

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-02-14 10:54:16 -08:00
Michael Crosby
faec567304
Merge pull request #3016 from jterry75/task_execid
Add ExecID for StateResponse
2019-02-14 11:47:19 -05:00
Justin Terry (VM)
b87e9eef3e Add ExecID for StateResponse
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-02-13 12:58:50 -08:00
Michael Crosby
543ee8e7f4
Merge pull request #3009 from jterry75/taskdelete_exec
Add support for TaskDelete event on exec in RuntimeV2
2019-02-13 14:05:29 -05:00
Phil Estes
41e3aaee58
Merge pull request #3008 from JoeWrightss/patch-3
Fix some misspells in helpers_test.go
2019-02-13 09:58:37 -08:00
zhoulin xie
bfb266ab5d Fix some misspells in helpers_test.go
Signed-off-by: zhoulin xie <zhoulin.xie@daocloud.io>
2019-02-14 00:02:17 +08:00
Derek McGowan
dc09ed1e1a
Add image handler wrapper
Gives clients more control of the pull process, allowing
the client to operate on a descriptor after it has been
pulled. This could be useful for filtering output or
tracking children before they dispatched to. This can
also be used to call custom unpackers to have visibility
into a pulled config in parallel to the downloads.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-02-12 16:34:06 -08:00
Justin Terry (VM)
a4f7b3758e Add support for TaskDelete event on exec in RuntimeV2
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-02-12 15:50:21 -08:00
Michael Crosby
f5b0fa220d
Merge pull request #2993 from kevpar/lcow-layer-order
Fix LCOW layer ordering
2019-02-12 12:21:51 -05:00
Michael Crosby
cb748dba98
Merge pull request #3007 from jterry75/fix_tty_windows
Stop sending stderr with TTY on Windows
2019-02-12 10:52:29 -05:00
Justin Terry (VM)
00895670e7 Stop sending stderr with TTY on Windows
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-02-11 23:11:40 -08:00
Phil Estes
521a44baff
Merge pull request #2997 from thaJeztah/bump_runc_cve_2019-5736
Update runc to 6635b4f (CVE-2019-5736)
2019-02-11 07:08:27 -08:00
Sebastiaan van Stijn
14eaad0cd9
Update runc to 6635b4f0c6af3810594d2770f662f34ddc15b40d (CVE-2019-5736)
Includes 6635b4f0c6,
which fixes a vulnerability in runc that allows a container escape (CVE-2019-5736)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-11 15:18:59 +01:00
Phil Estes
b02ab6c742
Merge pull request #2990 from jhowardmsft/jjh/bumpruntimespec
Vendor opencontainers/runtime-spec 29686dbc
2019-02-10 16:48:05 -08:00
John Howard
98766e863e Vendor opencontainers/runtime-spec 29686dbc
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-02-07 18:47:53 -08:00
Kevin Parsons
225d9b120c Fix LCOW layer ordering
Due to an error in the OCI specf for layerFolders, the runhcs shim was
passing the layers for LCOW in reverse order. This fixes the ordering
by simply removing the code which reversed the layers for LCOW.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-02-07 17:27:01 -08:00
Derek McGowan
4543e32a8b
Merge pull request #2986 from thaJeztah/remove_normalize_image_ref
Use distribution's reference.ParseDockerRef
2019-02-07 16:29:21 -08:00
Phil Estes
0922c69a54
Merge pull request #2989 from ehotinger/ehotinger/rmbin
Removes the oci.test.exe binary.
2019-02-07 15:46:34 -05:00
Eric Hotinger
0190e5f390 Removes the oci.test.exe binary.
Signed-off-by: Eric Hotinger <ehotinger@gmail.com>
2019-02-07 11:55:20 -08:00
Sebastiaan van Stijn
525802f9ce
Use distribution's reference.ParseDockerRef
Using the cri utility caused other project to have
containerd/cri as a dependency, only for this utility.

The new `reference.ParseDockerRef` function does the
same (other than having a different name).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-07 13:13:25 +01:00
Sebastiaan van Stijn
3538174e60
Bump github.com/docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-07 13:11:46 +01:00
Michael Crosby
0b89d42f92
Merge pull request #2981 from jhowardmsft/jjh/ocioptions
OCI Modifiers for Windows
2019-02-06 16:06:38 -05:00
Michael Crosby
64e8897159
Merge pull request #2979 from crosbymichael/shim-skel
Add shim skeleton code
2019-02-06 15:29:46 -05:00
Michael Crosby
2dacef07ca Add shim skeleton code
This allows runtime authors to quickly bootstrap new shim
implementations.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-02-06 15:03:02 -05:00
John Howard
59ea134ce1 OCI Modifiers for Windows
Signed-off-by: John Howard <jhoward@microsoft.com>

Needed for the containerd work on Windows and integrating the
oci package from containerd into moby.

No longer sets defaults for
 - .Process.ConsoleSize
 - .Windows.IgnoreFlushesDuringBoot
 - .Windows.Network.AllowUnqualifiedDNSQuery

Adds helper functions and tests for
 - WithWindowsIgnoreFlushesDuringBoot
 - WithWindowNetworksAllowUnqualifiedDNSQuery

Updates `ctr run` on Windows to use the new helper functions,
ConsoleSize is already handled.
2019-02-06 10:44:36 -08:00
Michael Crosby
b94b99d965
Merge pull request #2982 from dmcgowan/metadata-structure-documentation
Add structure documentation for metadata
2019-02-06 10:24:04 -05:00
Derek McGowan
d25007e548
Add structure documentation for metadata
Adds comment showing the structure of the buckets
as stored in boltdb. Includes all bucket names, key names
and descriptions of the stored values.

Moves the metadata comment to package level to be exposed
in the godoc overview.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-02-05 14:45:29 -08:00
Phil Estes
a410405f5d
Merge pull request #2978 from dmcgowan/cleanup-releases
Cleanup releases directory
2019-02-05 18:24:30 +00:00
Derek McGowan
823b7a8a05
Cleanup releases directory
Remove pre-release files which do not match the recommended
release process. This will prevent confusion when using
previous releases for reference.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-02-05 09:29:24 -08:00
Michael Crosby
5ba368748b
Merge pull request #2976 from Random-Liu/fix-potential-panic
Fix potential containerd panic.
2019-02-05 09:43:32 -05:00
Lantao Liu
7bd8dcd0d3 Fix potential containerd panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 00:38:02 -08:00
Phil Estes
ca65dc9316
Merge pull request #2975 from dmcgowan/update-release-docs
Add release documentation
2019-02-04 21:28:08 +00:00
Derek McGowan
41f5406211
Add release documentation
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-02-04 11:54:32 -08:00
Phil Estes
7dc2c64c9f
Merge pull request #2973 from Ace-Tang/fix_readme
readme: fix example for checkpoint
2019-02-04 15:26:01 +00:00
Ace-Tang
f014adfa17 readme: fix example for checkpoint
Signed-off-by: Ace-Tang <aceapril@126.com>
2019-02-02 19:57:36 +08:00
Michael Crosby
6b25c1e45c
Merge pull request #2970 from Random-Liu/fix-exec-race-condition
Fix exec race condition
2019-02-01 16:08:41 -05:00
Michael Crosby
18a8a061cc
Merge pull request #2971 from jterry75/runhcs_shim_exec_deadlock
Fix deadlock in Windows runhcs shim exec
2019-02-01 14:34:57 -05:00
Justin Terry (VM)
dfcc5942f1 Fix deadlock in Windows runhcs shim exec
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-02-01 10:58:01 -08:00