Commit Graph

8778 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
0ad60d4d9e
Bump docker/distribution to 0d3efadf0154c2b8a4e7b6621fff9809655cc580
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-02-07 13:02:37 +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
Lantao Liu
7c2498d2e6
Merge pull request #1037 from Random-Liu/support-unknown-state
Support unknown state
2019-02-05 14:06:24 -08:00
Lantao Liu
c27a12dd08 Update containerd to 5ba368748b.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -08:00
Lantao Liu
f8b3450847 Add integration test for unknown state
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -08:00
Lantao Liu
83af4dad87 Support unknown state for sandbox and container
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -08:00
Lantao Liu
4dc6f6d0b5 Add state machine for sandbox and container
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-05 11:56:24 -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
Lantao Liu
bfd25c80b4 Change StateUnknown to StateInit
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-04 11:24:49 -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
Nikhil Soni
da2ab865e0 Add documentation for using namespace labels for configuring defaults.
Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-02-01 23:14:33 +05:30
Lantao Liu
952d58297d Add a separate lock for pid.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-02-01 08:48:26 -08:00
Lantao Liu
9777d76890 Revert "use state machine management for exec.Pid()"
This reverts commit bbc2a995f9.

Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-31 18:59:34 -08:00
Nikhil Soni
34323985a1 Use labels only when default namespace is provided and prefer given
options.

Implements same approach of setting defaults for `NewWithConn`.

Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-01-30 23:21:24 +05:30
Nikhil Soni
59432aaecf Take default runtime and snapshotter from namespace labels
Signed-off-by: Nikhil Soni <krsoninikhil@gmail.com>
2019-01-30 23:21:24 +05:30
Phil Estes
f7f24e2f3a
Merge pull request #2967 from nitkon/patch-1
BUILDING: update BUILDING.md
2019-01-30 16:15:15 +00:00
Michael Crosby
118d321cca
Merge pull request #2961 from jterry75/fix_typo_path
Fix bug in shim path lookup
2019-01-30 11:11:55 -05:00
Nitesh Konkar
6629f853a7 BUILDING: update BUILDING.md
Improve documentation

Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
2019-01-30 18:40:27 +05:30
Lantao Liu
dd2846d941
Merge pull request #1035 from Random-Liu/add-runtime-option
Add RUNTIME env in integration and cri test.
2019-01-29 18:50:02 -08:00
Phil Estes
e26f442aca
Merge pull request #2963 from fuweid/remove-noop-loop
metadata/gc: remove the noop-loop for snapshot reference
2019-01-29 20:52:10 +00:00
Phil Estes
77d7b01233
Merge pull request #2962 from ostenbom/snapshots-docs
Update snapshots docs with garbage collector label
2019-01-29 20:50:40 +00:00
Michael Crosby
7fd3d02ff6
Merge pull request #2920 from Random-Liu/max-concurrent-download
Add image pull concurrency limit.
2019-01-29 15:05:01 -05:00
Lantao Liu
d7ed403072 Add image pull concurrency limit.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-29 10:27:05 -08:00
Michael Crosby
5abeeff84f
Merge pull request #2647 from teawater/gdb
Add build option "GODEBUG=1"
2019-01-29 12:04:05 -05:00
Oliver Stenbom
7f5d7ff6b8 Update snapshots docs with garbage collector label
Signed-off-by: Oliver Stenbom <oliver@stenbom.eu>
2019-01-29 15:37:56 +00:00
Wei Fu
34672d483d metadata/gc: remove the noop-loop for snapshot reference
The noop-loop does nothing.

The containerd doesn't have any snapshotter buckets at the beginning.
If user uses specific dir as rootfs to create container, and sets
`snapshotter` key to the container, like `overlayfs` by mistake,
the gc scheduler will try to scan the snapshotter and panic.

In order to avoid this case, remove the noop-loop here.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-01-29 19:11:28 +08:00
Justin Terry (VM)
6ed293ba94 Fix bug in shim path lookup
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 14:04:14 -08:00
Michael Crosby
f35c3527b2
Merge pull request #2960 from jterry75/shim_windows_lookpath
Add support for containerd shim activation's within the same folder not in PATH
2019-01-28 16:26:12 -05:00
Justin Terry (VM)
d63099c4a6 Allow matching shim path side by side with containerd
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 12:49:14 -08:00
Justin Terry (VM)
764afa0d18 Include extension for shim binary format on Windows
Use full name including extension for shim binary format on Windows in order to
match any stat path faster without a fallback.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-28 12:42:08 -08:00
Lantao Liu
0bd90a77ef Add RUNTIME env in integration and cri test.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-28 11:06:20 -08:00
Phil Estes
4259f63e04
Merge pull request #2959 from Quasilyte/patch-1
remove excessive []byte(s) conversion
2019-01-28 12:17:42 -05:00
Iskander (Alex) Sharipov
dfebb404cb
remove excessive []byte(s) conversion
`copy` permits using to mix `[]byte` and `string` arguments without
explicit conversion. I removed explicit conversion to make the code simpler.

Signed-off-by: Iskander Sharipov <quasilyte@gmail.com>
2019-01-28 19:50:28 +03:00
Mike Brown
90492e9e70
Merge pull request #1034 from fuweid/cleanup
hack: handle additional cleanup from #1028
2019-01-25 20:13:26 -06:00
Wei Fu
c019ae8b21 hack: handle additional cleanup from #1028
remove the `unset` in the script.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-01-26 09:38:16 +08:00
Phil Estes
9f705f40b8
Merge pull request #2958 from crosbymichael/runcv2-events
Move task events to runc v2 shim
2019-01-25 16:24:01 -05:00