github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
3,069 Commits 3 Branches 2 Tags 112 MiB
00bc24fcea
Commit Graph

3069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek McGowan
81b893ace4 Merge pull request #1194 from AkihiroSuda/nit-comment 
comment: dist -> ctr
 2017-07-16 21:48:45 -07:00
Akihiro Suda
a0664b5ce5 comment: dist -> ctr 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-07-16 14:45:56 +00:00
Derek McGowan
e48ef84b20 Merge pull request #1190 from stevvooe/remove-dist-command 
cmd/dist: completely remove dist command
 2017-07-14 16:19:50 -07:00
Stephen J Day
98f6deb50e cmd/dist: completely remove dist command 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-07-14 15:48:39 -07:00
Derek McGowan
751598e806 Merge pull request #1189 from stevvooe/move-content-commands 
cmd/{ctr, dist}: move content command to ctr
 2017-07-14 15:37:18 -07:00
Stephen J Day
1db80ed966
cmd/{ctr, dist}: move content command to ctr 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-07-14 15:31:36 -07:00
Derek McGowan
695351f38e Merge pull request #1188 from stevvooe/move-images-command 
cmd/{ctr,dist}: move images command to ctr
 2017-07-14 15:07:01 -07:00
Stephen Day
1905380ae1 Merge pull request #1187 from stevvooe/use-protobuild 
protobuild: replace protobuild command
 2017-07-14 14:51:43 -07:00
Stephen J Day
f7306d7f6c
cmd/{ctr,dist}: move images command to ctr 
Rather than make a large PR, we can move parts of the dist commands over
piece by piece. This first step moves over the images command. Others
will follow.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-07-14 14:50:02 -07:00
Michael Crosby
d50e4bcdf3 Merge pull request #1183 from mlaventure/move-tasklist-to-runtime 
Move taskList to the runtime package
 2017-07-14 14:10:16 -07:00
Stephen J Day
6c925924db
protobuild: replace protobuild command 
To make the protobuild tool broadly useful, it has been broken out into
a separate project. This PR replaces the command with a configuration
file.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2017-07-14 14:10:06 -07:00
Stephen Day
31324e5417 Merge pull request #1181 from mlaventure/fix-races 
Fix races
 2017-07-14 13:07:39 -07:00
Kenfe-Mickael Laventure
a5b3038ccc
Fix deadlock when task's exec start fails 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-14 21:54:30 +02:00
Kenfe-Mickael Laventure
9dcf725b76
Fix data race when task's exec fails to start 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-14 21:54:30 +02:00
Kenfe-Mickael Laventure
ae334b045f
Prevent a data race in client_test.go on test failure 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-07-14 21:54:30 +02:00
Kenfe-Mickaël Laventure
bf67906370 Merge pull request #1186 from estesp/update-fifo-racefix 
Update containerd/fifo for race fix
 2017-07-14 21:53:15 +02:00
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