Commit Graph

5732 Commits

Author SHA1 Message Date
Stefan Berger
5cf79913e4 gpg: Use a Pipe() rather than a file
Use a Pipe() rather than a file to pass the passphrase to the command
line tool. Pass the file descriptor to read the passphrase from as fd '3'.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-07-31 16:07:25 -04:00
Stefan Berger
6a25128791 gpg: Pass the passphrase to the gpg2 tool using a file
Rather than passing the passphrase via command line write it into
a temp. file and pass the name of the file using passphrase-file option.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-07-31 16:07:25 -04:00
Maksym Pavlenko
3741fd8591 Remove deferred flag when removing devmapper device
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-31 11:28:33 -07:00
Kevin Parsons
b16e7c5de1 Update pkg/ttrpcutil with improved pipe dial logic
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-07-30 18:46:36 -07:00
Wei Fu
a49df98ee9
Merge pull request #3468 from crosbymichael/custom-cgroup
Improve custom cgroup test
2019-07-31 09:23:02 +08:00
Kevin Parsons
daf12cd194 Improve error return from AnonDialer on Windows
AnonDialer will now return a "not found" error if the pipe is not found
before the timeout is reached. If the pipe exists but the timeout is
reached while attempting to connect, the timeout error will still be
returned.

This will allow the error handling logic to work properly when
connecting to the shim log pipe. An error message is only logged if the
error is not "not found", so now log noise from log pipes that were
never intended to be created by the shim will be hidden.

This change also cleans up the control flow for AnonDialer on Windows.
The new code should be more easily readable, but the only semantic
change is the error return value change.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-07-30 17:20:37 -07:00
Maksym Pavlenko
4d5a0e19eb Mark faulty device in one transaction
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-30 16:26:55 -07:00
Justin
e04f9599ae
Merge pull request #3469 from crosbymichael/pb.txt
Add note about pb.txt files
2019-07-30 15:36:09 -07:00
Maksym Pavlenko
878a3205cd Better error recovery in devmapper
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-30 15:17:17 -07:00
Michael Crosby
578216950d Add note about pb.txt files
Closes #3163

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-30 20:10:05 +00:00
Michael Crosby
f68186e107 Improve custom cgroup test
Ref: #3272

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-30 19:45:30 +00:00
Akihiro Suda
4195136eea
Merge pull request #3433 from dmcgowan/gc-docs
Add garbage collection doc
2019-07-30 14:03:01 +09:00
Derek McGowan
8a6190856b
Add 1.3 beta release note
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-29 15:20:47 -07:00
Derek McGowan
172fe90e55
Merge pull request #3447 from mxpv/update
Call Update of snapshotter plugin
2019-07-29 13:05:28 -07:00
Michael Crosby
d099058086
Merge pull request #3463 from dzzg/patch-2
fix wrong spells in compression.go
2019-07-29 13:50:36 -04:00
Michael Crosby
fbca688971
Merge pull request #3449 from YLonely/container-delete-bug
bug fix:#3448
2019-07-29 10:49:16 -04:00
dzzg
612628c2f9 fix wrong spells in compression.go
Signed-off-by: zhengguang zhu <zhengguang.zhu@daocloud.io>
2019-07-29 12:47:17 +00:00
Maksym Pavlenko
98ead46d1a Call Update of snapshotter plugin
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-07-26 15:56:07 -07:00
Phil Estes
eabb536b1f
Merge pull request #3462 from crosbymichael/ctr-hang
Call CloseIO when stdin closes in ctr
2019-07-26 17:13:02 -04:00
Phil Estes
e00ebfbf06
Merge pull request #3461 from crosbymichael/pid-fastpath
Fast path getting pid from task
2019-07-26 15:53:51 -04:00
Michael Crosby
f543f2fbcd Call CloseIO when stdin closes in ctr
Fixes #2439

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-26 19:52:03 +00:00
Michael Crosby
eb4b3e8772 Fast path getting pid from task
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-26 17:48:00 +00:00
Brandon Lum
8cd480c233 Specify protocols in ctr encrypt recipients
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2019-07-26 13:20:22 -04:00
BoWen Yan
e3cc9c20cb bug fix:#3448
Signed-off-by: BoWen Yan <loneybw@gmail.com>
2019-07-26 23:28:24 +08:00
Phil Estes
ab78270e03
Merge pull request #3456 from dzzg/patch-1
fix mis-spelling in client.go
2019-07-26 07:53:46 -04:00
dzzg
c27e48d666
fix mis-spelling in client.go
Signed-off-by: dzzg <zhengguang.zhu@daocloud.io>
2019-07-26 13:33:04 +08:00
Derek McGowan
22f44c44d9
Add garbage collection doc
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-25 14:42:30 -07:00
Phil Estes
29930e9185
Merge pull request #3455 from dmcgowan/fix-default-import-compression
Add option to compress blobs on import
2019-07-25 16:45:11 -04:00
Derek McGowan
02826345cf
Add option to compress blobs on import
Change the default back to leave uncompressed and add
option to do the compression.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-25 12:05:38 -07:00
Phil Estes
7ff23438f6
Merge pull request #3452 from lumjjb/keybundles
Create CryptoConfig constructors to replace dcparameters
2019-07-25 14:57:59 -04:00
Michael Crosby
2190c0e5f7
Merge pull request #3450 from kevpar/windows-alloc-console
Allocate a conhost during Windows service startup
2019-07-25 14:55:22 -04:00
Phil Estes
15b59f9684
Merge pull request #3441 from YLonely/multiple-task-delete
Update ctr to support deleting multiple tasks at a time
2019-07-25 14:29:31 -04:00
Michael Crosby
41e172352c
Merge pull request #3444 from crosbymichael/state-timeout
Add timeout to task state calls
2019-07-25 12:55:11 -04:00
Michael Crosby
577872fda5
Merge pull request #3454 from fuweid/enrich-error-message
archive: return chtimes error with path information
2019-07-25 12:19:40 -04:00
Wei Fu
9da7d30362 archive: return chtimes error with path information
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2019-07-25 16:33:19 +08:00
Brandon Lum
3d1fa69694 Implemented constructors for both encryption and decryption
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2019-07-24 22:19:39 -04:00
BoWen Yan
392668d007 ctr:Support deleting multiple tasks at a time
Signed-off-by: BoWen Yan <loneybw@gmail.com>
2019-07-25 09:59:15 +08:00
Brandon Lum
05a2b63e84 Create CryptoConfig constructors in place of dcparameters
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2019-07-24 21:51:47 -04:00
Kevin Parsons
1c7eab1979 Allocate a conhost during Windows service startup
Creating a console for containerd causes it to be inherited by any child
processes, which gives us performance and reliability improvements. See
comment in code for more information.

Another option considered here would be to invoke each child process
with the DETACHED_PROCESS flag. This would save us the containerd
console allocation. The difficulty of this approach would be ensuring
that all process invocation points have had this flag added, and that
any future invocations also use the flag.

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2019-07-24 17:50:24 -07:00
Phil Estes
fdab4f4789
Merge pull request #3446 from stefanberger/cleanup
Wrap creation of CryptoConfig in constructors
2019-07-24 14:46:13 -04:00
Phil Estes
a4e2ea5c99
Merge pull request #3439 from crosbymichael/rm-windows
Remove windows v1 runtime
2019-07-24 08:47:04 -04:00
Phil Estes
6c912315db
Merge pull request #3445 from dmcgowan/fixup-releases
Update releases doc for 1.1 release
2019-07-24 08:45:42 -04:00
Stefan Berger
364de4c35d Wrap creation of CryptoConfig in constructors
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
2019-07-23 19:53:23 -04:00
Derek McGowan
51bc615338
Update releases doc for 1.1 release
Fix some wording and status of 1.1 release.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-07-23 14:09:50 -07:00
Michael Crosby
101d4b78eb Add timeout to task state calls
Fixes #3440

This also returns the task that times out or has an error on the state
call in an UNKNOWN status so that the user can manually kill and remove
the task.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-23 19:58:41 +00:00
Michael Crosby
e097ab8bb4 Disable windows integration tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-23 18:55:11 +00:00
Michael Crosby
f055bdb0aa Remove windows v1 runtime
Closes #3094

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-07-23 18:54:37 +00:00
Derek McGowan
f7761411b8
Merge pull request #3424 from crosbymichael/devices
Add linux device options and --devices flag to ctr
2019-07-22 16:39:02 -07:00
Phil Estes
49fdb9e1b4
Merge pull request #3430 from lumjjb/encgcfix
Made fixes and optimizations to encryption GC
2019-07-22 19:23:47 -04:00
Brandon Lum
d531e78499 Modified image_enc_test to use a different image from other tests
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2019-07-22 16:06:16 -04:00