Commit Graph

1881 Commits

Author SHA1 Message Date
Kenfe-Mickael Laventure
33598cc5d3
linux: Wrap error with contextual message
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-14 10:21:48 -07:00
Kenfe-Mickael Laventure
171759a233
linux: Return grpc error description only
This avoid having "rpc error: code = Unknown" in the final output.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-06-14 10:21:48 -07:00
Derek McGowan
3a226ef17d
Update logic to determine if layer is empty
Handle reliance on the size field when the throwaway field is not used.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-14 10:07:40 -07:00
Derek McGowan
9f90d8a9b4
Add schema1 conversion on pull
closes #851

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-14 10:07:39 -07:00
Michael Crosby
7dbf26ecf6 Merge pull request #1001 from ijc/nuke-getTempDir
ctr: Remove getTempDir
2017-06-14 09:06:29 -07:00
Ian Campbell
e9559c6eed ctr: Remove getTempDir
It is unused since 4c1af8fdd8 ("Port ctr to use client") and leaving it
around will just tempt people into writing code with security holes.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-06-14 15:30:11 +01:00
Akihiro Suda
e4bc59a295 package for manipulating OCI images
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-06-14 06:49:56 +00:00
Phil Estes
4576979244 Merge pull request #997 from stevvooe/no-image-container
containerd: allow containers without an image
2017-06-13 16:26:04 -04:00
Stephen J Day
27af417668
containerd: allow containers without an image
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-13 11:23:53 -07:00
Stephen Day
4d44b9358e Merge pull request #988 from dmcgowan/client-default-namespace
Add default namespace to client
2017-06-12 16:24:28 -07:00
Michael Crosby
2e048ec589 Merge pull request #965 from dmcgowan/content-read-at
Update push to use copy
2017-06-12 16:19:53 -07:00
Derek McGowan
e67c6be052
Add default namespace to client
Adds a default namespace to the client.
Intercepts client requests to add namespace to context.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-12 15:47:58 -07:00
Michael Crosby
9226143b16 Merge pull request #978 from crosbymichael/process-delete
Add DeleteProcess API for removing execs
2017-06-12 10:00:12 -07:00
Kenfe-Mickaël Laventure
64e83bab10 Merge pull request #991 from crosbymichael/test-name
Use t.Name() for container ids in tests
2017-06-12 09:40:58 -07:00
Michael Crosby
ff598449d1 Add DeleteProcess API for removing execs
We need a separate API for handing the exit status and deletion of
Exec'd processes to make sure they are properly cleaned up within the
shim and daemon.

Fixes #973

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-12 09:32:23 -07:00
Michael Crosby
be5da790a3 Use t.Name() for container ids in tests
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-12 09:27:17 -07:00
Qiang Huang
4e8548cd3f Merge pull request #987 from crosbymichael/report-jun9
Add dev report for june 9th
2017-06-10 21:48:25 +08:00
Michael Crosby
7fb4c6d185 Add dev report for june 9th
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-09 16:33:36 -07:00
Michael Crosby
cf602e3aac Merge pull request #979 from dmcgowan/content-upload-lock-fix
Replace lockfile with reference lock
2017-06-09 15:02:57 -07:00
Stephen Day
7759386675 Merge pull request #986 from estesp/non-block-grpc-dist
Don't use WithBlock() on `dist` gRPC connection
2017-06-09 13:59:32 -07:00
Phil Estes
9f028b50cb
Don't use WithBlock() on dist gRPC connection
When using WithBlock() on the dialer, the connection timeout must fully
expire before any status is provided to the user about whether they can
even connect to the socket. For example, if the containerd socket is
root-owned and the user tries `dist images ls` without `sudo`, the
default is 30 sec. of "hang" before the command returns.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-06-09 15:40:14 -04:00
Michael Crosby
beaff3d81d Merge pull request #985 from samuelkarp/task-delete-nil-check
containerd: nil-check before calling io.Close
2017-06-09 11:31:04 -07:00
Michael Crosby
c45dae71db Merge pull request #983 from tonistiigi/fix-ctx-imports
Fix context package imports
2017-06-09 11:23:49 -07:00
Samuel Karp
779efbce6a containerd: nil-check before calling io.Close
Signed-off-by: Samuel Karp <skarp@amazon.com>
2017-06-09 11:21:40 -07:00
Derek McGowan
6c91ee2dac Merge pull request #980 from crosbymichael/service-tasks
Namespace tasks within runtime
2017-06-09 11:02:33 -07:00
Tonis Tiigi
39d55cc498 Fix context package imports
Conflicting with definition of plugin.Differ

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-06-09 10:58:29 -07:00
Michael Crosby
588c11852b Move task list to runtimes
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-09 10:37:33 -07:00
Michael Crosby
a40f307e88 Namespace cgroups monitor ids
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-09 10:35:17 -07:00
Michael Crosby
745398b2e9 Remove tasks map from service
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-09 10:35:17 -07:00
Derek McGowan
3c4e2a36dc Merge pull request #976 from crosbymichael/attach
Add `ctr attach` for reattaching to running task
2017-06-09 10:19:18 -07:00
Michael Crosby
5d1669bcfb Add ctr attach for reattaching to running task
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-09 10:10:39 -07:00
Derek McGowan
1cdb010783
Replace lockfile with reference lock
Updates content service to handle lock errors and return
them to the client. The client remote handler has been
updated to retry when a resource is locked until the
resource is unlocked or the expected resource exists.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-08 16:07:38 -07:00
Michael Crosby
a6314cad65 Merge pull request #971 from stevvooe/namespace-snapshotters
snapshot/storage: namespace snapshot drivers
2017-06-08 13:37:16 -07:00
Stephen J Day
b1a70aa335
snapshot/storage: namespace snapshot drivers
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-08 12:29:26 -07:00
Derek McGowan
b591af4224 Merge pull request #977 from crosbymichael/tip
Remove tip
2017-06-08 11:07:28 -07:00
Michael Crosby
4fbfe1d083 Merge pull request #974 from miaoyq/del-alias-of-images
Remove the redundant alias of 'dist images'
2017-06-08 10:50:47 -07:00
Michael Crosby
385a007661 Remove tip
Go tip test runners are 2x as slow as everything else.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-08 10:34:39 -07:00
Kenfe-Mickaël Laventure
18d53c2e6e Merge pull request #972 from stevvooe/namespace-containers-storage
metadata: properly namespace containers storage
2017-06-08 09:54:32 -04:00
Yanqiang Miao
7627130ea3 Remove the redundant alias of 'dist images'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
2017-06-08 18:56:29 +08:00
Stephen J Day
6414c68b16
metadata: properly namespace containers storage
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-06-07 17:58:40 -07:00
Stephen Day
0b13b07092 Merge pull request #970 from dmcgowan/remote-writer-ref
Set the remote writer ref on writer creation
2017-06-07 16:51:38 -07:00
Derek McGowan
9211a1daa7
Set the remote writer ref on writer creation
Ensures that status calls to the remote writer correctly
sets the ref.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-07 16:40:42 -07:00
Derek McGowan
636a24eef6
Add status tracker for Docker remote push
Update push client to use status tracker

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-07 10:59:52 -07:00
Derek McGowan
5615b68f06
Update pusher to use content writer
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-07 10:57:00 -07:00
Derek McGowan
621760f10a
Add ReaderAt support to content store
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-07 10:43:00 -07:00
Kenfe-Mickaël Laventure
9c0897d524 Merge pull request #967 from crosbymichael/task-ns
Namespace tasks via runc --root
2017-06-07 07:31:14 -07:00
Michael Crosby
497db9ac06 Namespace tasks via runc --root
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-06-06 16:31:00 -07:00
Michael Crosby
95efd45db0 Merge pull request #946 from dmcgowan/client-dist-pull
Update dist pull to use client
2017-06-06 15:25:22 -07:00
Kenfe-Mickaël Laventure
6428b4bad0 Merge pull request #962 from crosbymichael/client-ctr
Port ctr to use client package
2017-06-06 15:20:47 -07:00
Derek McGowan
ca25c0408e
Update dist pull to use client
Replaced pull unpacker with boolean to call unpack.
Added unpack and target to image type.
Updated progress logic for pull.
Added list images to client.
Updated rootfs unpacker to use client.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-06-06 15:03:52 -07:00