Commit Graph

5275 Commits

Author SHA1 Message Date
Michael Crosby
35582cb7a3
Merge pull request #2899 from fuweid/proposal-add-Add-method-in-PlatformRuntime
runtime: add Add/Delete method in PlatformRuntime interface
2019-01-22 13:48:39 -05:00
Justin Terry (VM)
6468619d73 Implement the Runtime v2 Shim async task model for runhcs
Changes the requirement of a Runtime v2 shim in order to avoid race conditions
between shim and shim client sending async events. Places a requirement of what
events and what order a shim must comply to.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-17 14:56:37 -08:00
Michael Crosby
3acf6f1835
Merge pull request #2936 from estesp/post-2622-cleanups
Handle additional cleanups from prior PR
2019-01-17 11:58:42 -05:00
Phil Estes
b444d7d507
Handle additional cleanups from prior PR
Update comment and streamline getting the default platform spec

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-01-16 13:07:29 -05:00
Phil Estes
df97414a77
Merge pull request #2622 from kadisi/export_bug
fix ctr image export not found error
2019-01-16 12:59:34 -05:00
Michael Crosby
7d75a3f282
Merge pull request #2935 from jhowardmsft/jjh/rightexitcode
Windows: Publish exit status correctly in TaskExit
2019-01-15 15:17:11 -05:00
Michael Crosby
4915476f11
Merge pull request #2934 from jhowardmsft/jjh/fifoset
Windows:NewDirectIOFromFIFOSet
2019-01-15 15:17:02 -05:00
John Howard
4ef9bf5c84 Windows: Publish exit status correctly in TaskExit
Signed-off-by: John Howard <jhoward@microsoft.com>

Before this change, the shim was only publishing a non-zero exit status
(exit code) in the case that the process.Wait() call failed. This
grabs the exit status correctly when process.Wait() succeeds too.
2019-01-15 11:12:27 -08:00
John Howard
90caf6f6a7 Windows:NewDirectIOFromFIFOSet
Signed-off-by: John Howard <jhoward@microsoft.com>
2019-01-15 10:04:43 -08:00
Michael Crosby
96f306ee4c
Merge pull request #2900 from Ace-Tang/fix_snapshot_remove
fix: miss remove temp file in createSnapshot
2019-01-15 11:42:27 -05:00
Phil Estes
804faeacdb
Merge pull request #2930 from cpuguy83/update_ttrpc
Update ttrpc to support context timeout.
2019-01-15 11:23:00 -05:00
Michael Crosby
4bad5c0247
Merge pull request #2931 from AkihiroSuda/runc20190115
bump up runc for pivot fix
2019-01-15 10:57:09 -05:00
Phil Estes
33b56e253e
Merge pull request #2927 from jterry75/bug_io_relay_close
Fix issue in runhcs shim CloseIO
2019-01-15 09:59:09 -05:00
Phil Estes
038d707889
Merge pull request #2929 from dmcgowan/releases-update
Update releases files
2019-01-15 09:58:15 -05:00
Akihiro Suda
3aec9e7beb bump up runc
Changes: 96ec2177ae...12f6a99120

Including critical security fix for `runc run --no-pivot` (`DOCKER_RAMDISK=1`): https://github.com/opencontainers/runc/pull/1962

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2019-01-15 16:27:31 +09:00
Brian Goff
0befa457d3 Update ttrpc to support context timeout.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2019-01-14 20:11:53 -08:00
Derek McGowan
946e402663
Update releases files
Brings versions and statuses up to date

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-01-14 15:42:55 -08:00
John Howard
e30bba53ff
Merge pull request #2926 from jterry75/bug_argon_mount
Fix runhcs shim bug in Create with "len(Rootfs) == 0"
2019-01-14 15:26:32 -08:00
Derek McGowan
5a6b18042b
Merge pull request #2925 from jterry75/bug_exec_pid
Fixes a bug in runhcs shim Exec.Pid
2019-01-14 14:48:48 -08:00
Phil Estes
c171b615ff
Merge pull request #2814 from fuweid/support_legacy_media_type
bugfix: support application/octet-stream during pull
2019-01-14 17:29:14 -05:00
Justin Terry (VM)
c5a8c9fc12 Fix issue in runhcs shim CloseIO
The call was closing all upstream IO when a shim.CloseIO call was made rather
than just the Stdin as it is supposed to.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-14 13:31:28 -08:00
Justin Terry (VM)
31616e7945 Fix runhcs shim bug in Create with "len(Rootfs) == 0"
Rootfs length can be set to zero if the upstream caller fully manages storage
and mounts on their own. In this case just treat the bundle as a fully complete
OCI spec and run it without doing any storage work in the shim.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-14 13:24:15 -08:00
Justin Terry (VM)
bcd4cc51c8 Fixes a bug in runhcs shim Exec.Pid
When an exec occurs the pid was not properly updated on the in memory state
value causing many queries to see a 0.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-14 13:18:02 -08:00
Derek McGowan
8706a355dd
Merge pull request #2889 from linxiulei/isolated_content
metadata: define content sharing policy
2019-01-14 13:15:38 -08:00
Michael Crosby
adfaa697a8
Merge pull request #2887 from andrey-ko/args-fix
fix oci.WithImageConfigArgs for windows
2019-01-07 17:00:25 -05:00
Michael Crosby
b5a794649a
Merge pull request #2911 from estesp/security-audit
Add security audit report to README
2019-01-07 12:01:13 -05:00
Michael Crosby
fcf5462d49
Merge pull request #2914 from jterry75/runhcs_runtime_opts
Update runhcs options to include CRI Sandbox support
2019-01-07 11:54:41 -05:00
Michael Crosby
30003c4439
Merge pull request #2910 from jterry75/shim_shutdown_error_log
Fix spurious ttrpc client shutdown error log on success
2019-01-07 11:54:07 -05:00
Justin Terry (VM)
bc76e01a87 Update runhcs options to include CRI Sandbox support
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-04 14:37:10 -08:00
Phil Estes
a79879e9dd
Add security audit report to README
Also remove weekly development reports section from README as those are
not being produced regularly at this time.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-01-04 09:56:03 -05:00
Justin Terry (VM)
dee0945e18 Fix spurious ttrpc client shutdown error log on success
Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
2019-01-03 13:44:29 -08:00
Akihiro Suda
231bff7f60
Merge pull request #2909 from Random-Liu/update-cri
Update cri to 4b4b2abb2e.
2019-01-03 06:48:05 +09:00
Lantao Liu
64a0046416 Update cri-tools to v1.13.0.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-02 12:54:55 -08:00
Lantao Liu
b55c9c6c35 Update cri to 4b4b2abb2e.
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-01-02 10:50:25 -08:00
Akihiro Suda
6ba92a7921
Merge pull request #2908 from JoeWrightss/patch-2
Fix annotation typo errors
2019-01-01 16:08:02 +09:00
JoeWrightss
17b77aeb0e Fix annotation typo errors
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-31 22:40:06 +08:00
Wei Fu
5137fc6f11 bugfix: support application/octet-stream during pull
Even though application/octet-stream issue has been fixed in docker,
there exists lots of images which contains the invalid mediatype.

In order to pull those images, containerd client side modifies the
manifest content before insert/update image reference.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-12-29 13:58:36 +08:00
Wei Fu
568b5be936 runtime: add Add/Delete method in PlatformRuntime interface
The two new method Add/Delete can allow custom plugin to add or migrate
existing task into major Runtime plugin.

close: #2888

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2018-12-29 13:56:38 +08:00
Ace-Tang
7faaa64cf9 fix: miss remove temp file in createSnapshot
```
func foo() error {

defer func() {
    if err != nil {
	...
    }
}()
...
}
```
use defer func to do something when err not nil, if foo() not use
named error, `err != nil` can not catch all errors, since when err
re-defined in if condition, it is a new variable.

Signed-off-by: Ace-Tang <aceapril@126.com>
2018-12-24 23:01:56 +08:00
Phil Estes
47b328aab7
Merge pull request #2897 from crosbymichael/atomic-delete
Ensure bundle removal is atomic
2018-12-21 08:27:43 -05:00
Eric Lin
4247f2684d metadata: define content sharing policy
This changeset modifies the metadata store to allow one to set a
"content sharing policy" that defines how blobs are shared between
namespaces in the content store.

The default mode "shared" will make blobs available in all namespaces
once it is pulled into any namespace.  The blob will be pulled into
the namespace if a writer is opened with the "Expected" digest that
is already present in the backend.

The alternative mode, "isolated" requires that clients prove they have
access to the content by providing all of the content to the ingest
before the blob is added to the namespace.

Both modes share backing data, while "shared" will reduce total
bandwidth across namespaces, at the cost of allowing access to any
blob just by knowing its digest.

Note: Most functional codes and changelog of this commit originate from
Stephen J Day <stephen.day@docker.com>, see
40455aade8

Fixes #1713 Fixes #2865

Signed-off-by: Eric Lin <linxiulei@gmail.com>
2018-12-21 15:02:21 +08:00
akolomentsev
1be86af108 add test for WithImageConfigArgs
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-20 18:15:24 -08:00
Michael Crosby
36e4dc603e Ensure bundle removal is atomic
This makes bundle removal atomic by first renaming the bundle and
working directories to a hidden path before removing the underlying
directories.

Closes #2567
Closes #2327

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-12-20 13:45:18 -05:00
Phil Estes
06e04bc5a9
Merge pull request #2830 from Ace-Tang/support_cr_without_image
cr: support checkpoint/restore without image
2018-12-20 13:24:37 -05:00
Michael Crosby
9b366b2329
Merge pull request #2894 from thaJeztah/remove_website_leftovers
docs: remove website leftovers
2018-12-20 09:21:01 -05:00
Sebastiaan van Stijn
723797d320
docs: remove website leftovers
The website content moved to the github.com/containerd/containerd.io
repository.

Commit da1fba0050 removed all website-
related content, but there were some stray files left behind.

This patch removes those files, and updates the `.editorconfig` file
to only match Markdown files.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-12-20 10:01:51 +01:00
Ace-Tang
d4ecb00f6f checkpoint: return empty image if checkpointPath exist
Signed-off-by: Ace-Tang <aceapril@126.com>
2018-12-20 14:48:44 +08:00
akolomentsev
f2344db40a do not mutate defaults in replaceOrAppendEnvValues
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-19 16:38:22 -08:00
akolomentsev
da9471fb11 fix oci.WithImageConfigArgs for windows
Signed-off-by: Andrey Kolomentsev <andrey.kolomentsev@docker.com>
2018-12-19 12:25:36 -08:00
Phil Estes
48bebbb6e0
Merge pull request #2891 from thaJeztah/revert_temp_golang_fix
Revert "Fix CI due to Golang 1.10.6 / 1.11.3 regressions (workaround)"
2018-12-19 13:34:44 -05:00