Commit Graph

2903 Commits

Author SHA1 Message Date
Phil Estes
5e594d035d
Update containerd/fifo for race fix
Re-vendor containerd/fifo to pick up PR #13 to fix data race.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-07-14 15:42:44 -04:00
Phil Estes
56a4023a19 Merge pull request #1184 from stevvooe/label-commands
cmd/{ctr,dist}: label can be a verb
2017-07-14 11:50:22 -04:00
Stephen J Day
a8b2254911
cmd/{ctr,dist}: label can be a verb
Rather than using the more verbose `set-labels` command, we are changing
the command to set labels for various objects to `label`, as it can be
used as a verb. This matches changes in the content store labeling.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-13 14:36:13 -07:00
Kenfe-Mickael Laventure
88c1db5ca5
Move taskList to the runtime package
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-07-13 13:53:22 +02:00
Akihiro Suda
f72e97dbf8 Makefile: go build -i -> go build
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2017-07-13 10:31:49 +00:00
Stephen Day
8eadcb8c28 Merge pull request #1175 from stevvooe/alpha
containerd: prepare for v1.0.0-alpha0
2017-07-12 17:22:03 -07:00
Stephen J Day
98adb50f98
containerd: prepare for v1.0.0-alpha0
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-12 17:15:35 -07:00
Michael Crosby
89934640d8 Merge pull request #1174 from dmcgowan/refactor-committedat-createdat
Rename CommittedAt to CreatedAt in content interface
2017-07-12 17:11:02 -07:00
Derek McGowan
6a03917c38 Merge pull request #1173 from stevvooe/remote-container-store
containerd: remove GRPC service export
2017-07-12 17:05:28 -07:00
Stephen J Day
b385798695
containerd: remove GRPC service export
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-12 16:57:47 -07:00
Derek McGowan
6d032b99f2
Rename CommittedAt to CreatedAt in content interface
Use "created at" terminology to be consistent with the rest
of the containerd interfaces.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-12 16:51:16 -07:00
Michael Crosby
39dd45ebc6 Merge pull request #1150 from dmcgowan/content-labels
Content labels
2017-07-12 16:47:48 -07:00
Stephen Day
bee304cf3c Merge pull request #1171 from crosbymichael/spec-final
Update runtime spec to 96de01bbb42c7af89bff100e10a
2017-07-12 16:42:27 -07:00
Michael Crosby
83a38c2cec Update runtime spec to 96de01bbb42c7af89bff100e10a
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 16:29:23 -07:00
Derek McGowan
a78d0bdeac
Update the content interface to return info from update
Namespace keys used by client for uncompressed

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-12 16:22:13 -07:00
Stephen Day
a38bce0502 Merge pull request #1168 from dmcgowan/fix-btrfs-load
Create btrfs directory if it does not exist
2017-07-12 15:18:44 -07:00
Michael Crosby
e110706376 Merge pull request #1170 from stevvooe/identifier-validation
namespaces, identifiers: split validation
2017-07-12 15:15:17 -07:00
Derek McGowan
cc3a59e556 Merge pull request #1169 from crosbymichael/client-types
Remove protos from Go client API
2017-07-12 15:03:45 -07:00
Stephen J Day
9e5bd5a2dc
namespaces, identifiers: split validation
After review, there are cases where having common requirements for
namespaces and identifiers creates contention between applications.  One
example is that it is nice to have namespaces comply with domain name
requirement, but that does not allow underscores, which are required for
certain identifiers.

The namespaces validation has been reverted to be in line with RFC 1035.
Existing identifiers has been modified to allow simply alpha-numeric
identifiers, while limiting adjacent separators.

We may follow up tweaks for the identifier charset but this split should
remove the hard decisions.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-12 14:46:47 -07:00
Michael Crosby
3b8018d8cf Remove protos from Go client API
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 14:32:37 -07:00
Derek McGowan
4f388e0e27
Add documentation to rootfs functions
Clarifies role of varies rootfs functions as well as their return values.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-12 13:59:17 -07:00
Derek McGowan
fba7463ed3
Add labels and fileters to content
Update list content command to support filters
Add label subcommand to content in dist tool to update labels
Add uncompressed label on unpack

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-12 13:59:17 -07:00
Derek McGowan
1a49f5ea79 Merge pull request #1167 from crosbymichael/multi-ss
support using multiple snapshotters simultaneously
2017-07-12 13:34:31 -07:00
Phil Estes
052a8d03ed Merge pull request #1165 from crosbymichael/delete-hang
Fix process and task io Wait hang when fails to start
2017-07-12 14:58:05 -04:00
Derek McGowan
97bb760c2a
Create btrfs directory if it does not exist
We may want to create this as a subvolume if the parent is btrfs
or support mounting on load in the future.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-12 11:30:39 -07:00
Derek McGowan
c63b84dcbc Merge pull request #1158 from crosbymichael/task-events
Refactor runtime events into Task* types
2017-07-12 11:17:01 -07:00
Akihiro Suda
b06aab713a support using multiple snapshotters simultaneously
e.g. dist pull --snapshotter btrfs ...; ctr run --snapshotter btrfs ...
(empty string defaults for overlayfs)

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 11:16:12 -07:00
Michael Crosby
2b6d790ff4 Refactor runtime events into Task* types
This removes the RuntimeEvent super proto with enums into separate
runtime event protos to be inline with the other events that are output
by containerd.

This also renames the runtime events into Task* events.

Fixes #1071

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 10:57:57 -07:00
Stephen Day
8f1c11d862 Merge pull request #1163 from crosbymichael/rc6
Update runtime-spec rc6
2017-07-12 10:56:15 -07:00
Michael Crosby
cd4e8ba448 Add exec id check on client
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 10:41:04 -07:00
Michael Crosby
96b041e1f9 Close io when Start fails
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 10:37:39 -07:00
Michael Crosby
9a5db8715b Merge pull request #1166 from tonistiigi/alloc_leak
archive: fix allocation leak
2017-07-12 10:32:44 -07:00
Tonis Tiigi
19aed1a049 archive: fix allocation leak
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-07-12 10:24:52 -07:00
Michael Crosby
8ab4a61684 Merge pull request #1164 from ijc/configurable-shim-debug
Start of day configuration of shim debug setting
2017-07-12 10:10:42 -07:00
Ian Campbell
194b6e4f06 Start of day configuration of shim debug setting
This makes it possible to enable shim debug by adding the following to
`config.toml`:

    [plugins.linux]
    shim_debug = true

I moved the debug setting from the `client.Config struct` to an argument to
`client.WithStart` since this is the only place it would be used.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-12 17:48:27 +01:00
Michael Crosby
4e8943f7bb Update runtime-spec rc6
This should be the same commit tagged as the 1.0 release

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-12 09:32:41 -07:00
Daniel, Dao Quang Minh
0600399b0d Merge pull request #1159 from ijc/revndr
Rerun vndr with newest version
2017-07-12 11:41:24 +01:00
Ian Campbell
412d455374 Rerun vndr with newest version
This excludes things marked with "// +build ignore".

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2017-07-12 11:01:45 +01:00
Stephen Day
d173454719 Merge pull request #1129 from dmcgowan/content-namespace
Namespace content
2017-07-11 16:07:34 -07:00
Michael Crosby
ed0098c84c Merge pull request #1157 from crosbymichael/runtime-events
Add runtime events for pause,resume,checkpoint
2017-07-11 15:30:55 -07:00
Michael Crosby
58da62dd0f Add runtime events for pause,resume,checkpoint
Fixes #1068

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-07-11 12:38:20 -07:00
Phil Estes
8d5c0835fd Merge pull request #1156 from stevvooe/created-preservation
metadata: preserve createdat on update
2017-07-11 15:31:09 -04:00
Stephen J Day
6fa9a0b2df
metadata: preserve createdat on update
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-07-11 12:06:29 -07:00
Derek McGowan
46deddf460
Update list statuses to use filters
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-11 12:05:36 -07:00
Michael Crosby
1e8c80ae09 Merge pull request #1155 from estesp/ignore-pipe
Ignore SIGPIPE
2017-07-11 12:01:39 -07:00
Phil Estes
dad7e06238
Ignore SIGPIPE
Similar to code in the Docker daemon and containerd 0.2.x. Even if we
have a better deployment model in containerd 1.0 seems reasonable to
have this same fix in the rare case that it bites someone using
containerd 1.0.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2017-07-11 14:51:56 -04:00
Derek McGowan
4322664b88
Update task service to use metadata content store
Address feedback and fix issues

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-11 11:11:10 -07:00
Derek McGowan
b6d58f63a8
Support for ingest namespacing
Move content status to list statuses and add single status
to interface.
Updates API to support list statuses and status
Updates snapshot key creation to be generic

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-11 11:11:10 -07:00
Derek McGowan
2c9004d431
Add namespace content store in metadata
Add a metadata store for content which enforces content is
only visible inside a given namespace.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2017-07-11 11:11:10 -07:00
Derek McGowan
106c7504f4 Merge pull request #1151 from stevvooe/image-metadata-service
images, containers: converge metadata API conventions
2017-07-11 11:05:01 -07:00