Commit Graph

5305 Commits

Author SHA1 Message Date
Phil Estes
0dd3211a06
Remove containerd-release tool from main repo
The release-tool is now located in the `containerd/project` repo.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-19 12:13:38 -04:00
Ace-Tang
7b1b16b741 runtime-v2: add validation for runtime name
add validation for runtime name, if runtime name is invalid,
containerd will got panic.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-10-19 15:19:45 +08:00
Akihiro Suda
133ac5cd2a
Merge pull request #2730 from fuweid/fixtypo_in_runtime_package
fixtypo: misspell in runtime package
2018-10-19 10:23:54 +09:00
Derek McGowan
405518591d
Merge pull request #2727 from mikebrow/ignore-idempotence
allow idempotence when adding a task to cgroup metrics collection
2018-10-18 11:16:41 -07:00
Wei Fu
accadd7118 fixtypo: misspell in runtime package
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-18 23:21:05 +08:00
Mike Brown
879b2ae291 allow idempotence when adding a task to cgroup metrics collection
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-10-18 01:32:56 -05:00
Derek McGowan
9c1db67b3a
Merge pull request #2726 from lucperkins/lperkins/update-banner-url
Update banner URL
2018-10-17 13:41:05 -07:00
lucperkins
0c8a5ff72e Update banner URL
Signed-off-by: lucperkins <lucperkins@gmail.com>
2018-10-17 12:55:10 -07:00
Michael Crosby
f1f8cb017e
Merge pull request #2725 from fuweid/enhance_split_config_from_server
enhance: split config from server package
2018-10-17 10:22:51 -04:00
Wei Fu
06616dab00 enhance: split config from server package
The github.com/containerd/containerd/services/server has a lot of
dependencies, like content, snapshots services implementation and
docker-metrics.

For the client side, it uses the config struct from server package
to start up the containerd in background. It will import a lot of
useless packages which might be conflict with existing vendor's package.

It makes integration easier with single config package.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-17 16:34:39 +08:00
Derek McGowan
483724b0df
Merge pull request #2724 from crosbymichael/runc-lxc
Update runc to 58592df56734acf62e574865fe40b9e53e
2018-10-16 15:05:15 -07:00
Michael Crosby
d7769daa5e Update runc to 58592df56734acf62e574865fe40b9e53e
This includes fixes for user namespaces as well as a long standing bug
for running docker and containerd inside an lxc container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-16 15:47:41 -04:00
Derek McGowan
d6de12e2f3
Merge pull request #2723 from dmcgowan/update-version-rc.2
Update version to 1.2.0-rc.2
2018-10-16 11:03:45 -07:00
Derek McGowan
5e810c3e3d
Update version to 1.2.0-rc.2
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-16 10:26:16 -07:00
Michael Crosby
f1dfe86ef4
Merge pull request #2688 from crosbymichael/ctrdecodespec
decode spec in `ctr c info`
2018-10-16 09:38:43 -04:00
Michael Crosby
9fe52f66d6
Merge pull request #2721 from Ace-Tang/master
ctr: add some metric item
2018-10-16 09:38:30 -04:00
Ace-Tang
7ea75ef4a9 ctr: add some metric item
add memory limit, pid info into metric subcommand, since moby also
show them. As blkio read/write IO need more calculation,not add them.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-10-16 16:54:06 +08:00
Michael Crosby
acc3b839d3
Merge pull request #2714 from dmcgowan/fix-content-deadlock-after-error
Fix writer deadlock in local store
2018-10-15 21:17:45 -04:00
Michael Crosby
fdc4e1f426
Merge pull request #2720 from crosbymichael/stress-root
Fix stress test for image config opt requirements
2018-10-15 21:17:12 -04:00
Derek McGowan
0f756495a9
Fix writer deadlock in local store
The local store could end up in a state where the writer is
closed but the reference is locked after a commit on an
existing object.
Cleans up Commit logic to always close the writer even after
an error occurs, guaranteeing the reference is unlocked after commit.
Adds a test to the content test suite to verify this behavior.
Updates the content store interface definitions to clarify the behavior.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-15 16:33:45 -07:00
Michael Crosby
e86a0689fb Fix stress test for image config opt requirements
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-10-15 18:58:16 -04:00
Derek McGowan
d725ebe446
Merge pull request #2718 from jterry75/update_runhcs
Revendor github.com/Microsoft/hcsshim
2018-10-15 15:13:44 -07:00
Justin Terry (VM)
3f1d9b2c4f Revendor github.com/Microsoft/hcsshim
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-15 13:38:24 -07:00
Michael Crosby
5993d096ff
Merge pull request #2691 from fuweid/bugfix_cache_empty_label
bugfix: cache empty layer for docker schema1 image
2018-10-15 15:43:23 -04:00
Michael Crosby
3f5e6cdeaa
Merge pull request #2717 from dmcgowan/diff-set-uncompressed-label
Set uncompressed label on diff when already exists
2018-10-15 15:16:21 -04:00
Derek McGowan
26506e9e23
Update empty layer label
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-15 11:28:45 -07:00
Derek McGowan
bb197ddc47
Set uncompressed label on diff when already exists
Diff expects to set the uncompressed label on Commit, however
if the blob already exists in the content store, no labels
will get set, requiring an Update. Check if the uncompressed
label is on the blob and set it if not.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-15 11:02:35 -07:00
Michael Crosby
50c020f4d5
Merge pull request #2716 from estesp/reference-common-project-repo
Reference common project repo contents
2018-10-15 11:46:36 -04:00
Phil Estes
bd93a66fc2
Use common project repo copies of travis scripts
Remove local copies of common containerd/project located scripts for
DCO, fileheader, and vendor checks.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-15 09:05:48 -04:00
Phil Estes
6f3288333c
Move common repository details to project references
Now that all the content is set up appropriately in the
containerd/project repo, remove local copies and point to the common
project content from the containerd README.md

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-10-15 09:05:37 -04:00
Akihiro Suda
0146a48cb8
Merge pull request #2712 from nogoegst/mount-openbsd
mount: add support for OpenBSD
2018-10-13 11:23:21 +09:00
Akihiro Suda
61f4ecb1e1
Merge pull request #2713 from nogoegst/archive-openbsd
archive: add support for OpenBSD
2018-10-13 11:22:34 +09:00
Ivan Markin
a20603090f archive: add support for OpenBSD
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-10-12 22:29:24 +00:00
Ivan Markin
0828b7aa96 mount: add support for OpenBSD
Signed-off-by: Ivan Markin <sw@nogoegst.net>
2018-10-12 22:24:13 +00:00
Phil Estes
1a5f9a3434
Merge pull request #2710 from fuweid/enhance_support_duration_for_cpu_profile_collection
enhance: support specific duration for profile collection
2018-10-11 11:00:25 -04:00
Phil Estes
09aa58bee5
Merge pull request #2705 from jterry75/detachvhd
Dismount sandbox VHD on snapshot remove
2018-10-11 10:35:26 -04:00
Derek McGowan
f67459929e
Merge pull request #2700 from jiria/jiria/add-windows-arm-support
Add support to detect ARM variant on Windows
2018-10-10 16:47:54 -07:00
Jiri Appl
e6529f4ebc Add support to detect ARM variant on Windows
ARM variant detection logic was authored originally with
POSIX OS in mind. This change leaves POSIX code path unaltered
and adds support to detect ARM variant on Windows by leveraging
runtime.goarch.

Signed-off-by: Jiri Appl <jiria@microsoft.com>
2018-10-10 14:17:11 -07:00
Justin Terry (VM)
00242e1668 Dismount sandbox VHD on snapshot remove
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 13:35:06 -07:00
Phil Estes
31aa418f84
Merge pull request #2704 from jterry75/remove_tar2vhd
Remove dependency on tar2vhd for LCOW differ
2018-10-10 15:38:55 -04:00
Justin Terry (VM)
cce78d4b5d Remove dependency on tar2vhd for LCOW differ
This change no longer requires the use of a UtlityVM on Windows to convert the
layer tar to an ext4 vhd for LCOW. This has a significant performance boost
that makes linux/amd64 layer extraction comparable to native Linux performance.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-10 11:40:10 -07:00
Wei Fu
a2a23d91ca enhance: support specific duration for profile collection
The default duration of cpu profile collection in net/http/pprof is 30
seconds. User should have chance to set the specific duration for the
collection.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-10-10 22:57:54 +08:00
Phil Estes
15f19d7a67
Merge pull request #2702 from Random-Liu/update-cri-release-1.2
Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
2018-10-08 09:42:59 -04:00
Lantao Liu
88bfc17d14 Update cri to 8506fe836677cc3bb23a16b68145128243d843b5.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-10-05 14:53:17 -07:00
Derek McGowan
0c5f8f63c3
Merge pull request #2699 from dmcgowan/update-1.2-rc.1
Update version to 1.2-rc.1
2018-10-03 14:43:26 -07:00
Derek McGowan
7b750c7b83
Update version to 1.2-rc.1
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-10-03 14:00:06 -07:00
Derek McGowan
0e6a562b1d
Merge pull request #2698 from jterry75/lcow_spec_opt
Skip AdditionalGID's for LCOW oci spec
2018-10-03 13:58:09 -07:00
Justin Terry (VM)
223acbca2a Skip AdditionalGID's for LCOW oci spec
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2018-10-03 10:43:29 -07:00
Phil Estes
de4bb2ddfb
Merge pull request #2692 from jterry75/shim_reconnect
Various runhcs shim fixes
2018-10-03 10:51:04 +02:00
Phil Estes
43acab8100
Merge pull request #2690 from dmcgowan/resolver-updates
Update Docker resolver to pass in Authorizer interface
2018-10-03 09:58:42 +02:00