beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
28926 commits 14 branches 412 tags 338 MiB
Commit graph

285 commits

Author SHA1 Message Date
Sebastiaan van Stijn
a7db0a8402 Merge pull request #27294 from mlaventure/hide-unused-volume-fields 
Move types.Volumes optional fields under a new type
 2016-10-11 23:55:25 +02:00
Kenfe-Mickael Laventure
d36952749d Move types.Volumes optional fields under a new type 
This allows us to hide those fields when they are not filled.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-11 11:49:26 -07:00
allencloud
3af743bb32 return nil when no node or service to avoid additional api call 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-11 10:59:16 +08:00
Boaz Shuster
929a77b814 Hide the mutex in formatter.ContainerStats 
The formatter.ContainerStats struct exposes its Mutex.
This is a bad design and should be fixed.

To fix that, I separated the statistics
attributes from ContainerStats to StatsEntry and
hid the mutex. Notice that the mutex protects both
the `err` field and the statistics attributes.

Then, implemented SetStatistics, SetError, GetStatistics
and GetError to avoid races.

Moreover, to make this less granular, I decided to
replace the read-write mutex with the regular mutex and
to pass a StatsEntry slice to formatter.ContainerStatsWrite

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-10-10 21:52:53 +03:00
allencloud
fd62b6c950 better prune and system df 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-11 00:42:21 +08:00
Sebastiaan van Stijn
2f12d28084 Merge pull request #26778 from WeiZhang555/parallel-operations 
Support parallel kill,rm
 2016-10-10 18:31:10 +02:00
yuexiao-wang
6396c62fdc Add the OPTIONS and Fix the links for contain prune 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-11 00:13:33 +08:00
John Howard
e85867cb68 Windows: Support credential specs 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-10-06 09:32:22 -07:00
Alexander Morozov
f08a450ad3 Merge pull request #25837 from reaperhulk/support-compressing-build-context 
Add support for compressing build context during image build
 2016-10-05 12:57:46 -07:00
Arnaud Porterie
86de7c000f Merge pull request #26108 from mlaventure/data-mngt 
New Data Management commands
 2016-10-01 03:17:18 +00:00
Paul Kehrer
4825e58a96 Add support for compressing build context during image build 
When sending a build context to a remote server it may be
(significantly) advantageous to compress the build context. This commit
adds support for gz compression when constructing a build context
using a command like "docker build --compress ."

Signed-off-by: Paul Kehrer <paul.l.kehrer@gmail.com>
 2016-09-30 17:46:08 -05:00
Sebastiaan van Stijn
1b944a3025 Merge pull request #27049 from dnephin/fix-label-flag-type 
Use ListOpt for build labels
 2016-09-30 23:40:08 +02:00
Kenfe-Mickael Laventure
b650a7bd27 Add new df subcomand to the system command 
This command display the state of the data usage of the docker daemon.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-30 14:35:23 -07:00
Vincent Demeester
4fabc92cfc Merge pull request #26697 from allencloud/change-service-scale-logic 
validate service parameter in client side to avoid api call in `docker service scale`
 2016-09-30 18:37:35 +02:00
Daniel Nephin
6c3b44f755 Use ListOpt for labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-29 17:59:52 -04:00
Kenfe-Mickael Laventure
280c872366 Add subcommand prune to the container, volume, image and system commands 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-29 07:42:53 -07:00
Kenfe-Mickael Laventure
b717de5153 Update Images() to allow retrieving specific image size data 
Those data include:
 - size of data shared with other images
 - size of data unique to a given image
 - how many containers are using a given image

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-09-29 07:42:53 -07:00
allencloud
ddec4c3ee4 add \n in engine labels display in docker node inspect xxx --pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-29 18:17:54 +08:00
Vincent Demeester
b0e1b8fc79 Merge pull request #24850 from yongtang/24270-service-tasks-filter 
Fix partial/full filter issue in `service tasks --filter`
 2016-09-28 11:50:27 +02:00
Zhang Wei
2b773257e0 Support parallel rm 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-28 12:07:18 +08:00
Zhang Wei
d2bb3aba7e Support parallel kill 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-28 12:03:19 +08:00
Brian Goff
9a2f01ef13 Merge pull request #26951 from AkihiroSuda/update-ut-cli-command-service 
Fix cli/command/service/opts_test.go, and add some extra test cases
 2016-09-27 20:30:26 -04:00
Vincent Demeester
b881148385 Merge pull request #26255 from Microsoft/jjh/xenon-test-infrastructure 
Add isolation to info - enables Hyper-V containers CI bring-up
 2016-09-27 18:46:51 +02:00
Vincent Demeester
c505486bb1 Merge pull request #26906 from allencloud/add-endpoint-mode-in-service-pretty 
add endpoint mode in service pretty
 2016-09-27 18:28:43 +02:00
Akihiro Suda
4e01e7924d Fix cli/command/service/opts_test.go, and add some extra test cases 
`m.Set("type=volume,target=/foo,volume-nocopy")` is valid even though it lacks "source"

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-27 15:27:02 +00:00
Yong Tang
eb19c2f080 Let swarmkit handle cluster defaults in swarm init if not specified 
This fix tries to address the issue raised in 24958 where previously
`docker swarm init` will automatically fill in all the default value
(instead of letting swarmkit to handle the default).

This fix update the `swarm init` so that initial value are passed only
when a flag change has been detected.

This fix fixes 24958.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-27 04:19:38 -07:00
allencloud
70bb832060 add endpoint mode in service pretty 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-27 18:41:19 +08:00
Yong Tang
f676fc93c3 Fix partial/full filter issue in service tasks --filter 
This fix tries to address the issue related to 24108 and 24790, and
also the case from 24620#issuecomment-233715656

The reason for the failure case in the above mentioned issues is that
currently Task names are actually indexed by Service Name
(`e.ServiceAnnotations.Name`)

To fix it, a pull request in swarmkit (swarmkit/pull/1193) has been
opened separately.

This fix adds the integration tests for the above mentioned issues.
Swarmkit revendoring is needed to completely fix the issues.

This fix fixes 24108.
This fix fixes 24790.
This fix is related to 24620.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-26 16:01:20 -07:00
Sebastiaan van Stijn
a4dd51a660 Merge pull request #23886 from AkihiroSuda/stackcli 
add `docker stack ls`
 2016-09-26 21:19:04 +02:00
Arnaud Porterie
7944480dd0 Merge pull request #26839 from tonistiigi/build-cache 
Implement build cache based on history array
 2016-09-26 17:31:49 +00:00
allencloud
5ba203e73a validate service parameter in client side to avoid api call 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-26 17:18:02 +08:00
Aaron Lehmann
02cc464e1a cli: Add more nil checking to service pretty-printer 
Currently, if the service mode is not "global", this code assumes that
Replicated is non-nil. This assumption may not be true in the future.
Instead of making the assumption, explicitly check that Replicated is
non-nil before using it.

Similarly, for limits and reservations, enclose methods that read from
Limits and Reservations within checks that those fields are non-nil.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-09-26 10:12:24 +01:00
Vincent Demeester
8c929eeb34 Merge pull request #25853 from jhorwit2/jah/event-refactor 
Refactor to new engine-api events api
 2016-09-24 11:07:12 +02:00
John Howard
c4e1697274 Add isolation to info 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-23 12:13:29 -07:00
Tõnis Tiigi
690882c2e7 Implement build cache based on history array 
Based on work by KJ Tsanaktsidis

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Signed-off-by: KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>
 2016-09-23 11:30:06 -07:00
Vincent Demeester
72f556a9ff Merge pull request #26516 from yongtang/26453-build-bad-syntax 
Check bad syntax on dockerfile before building.
 2016-09-23 12:24:20 +02:00
Vincent Demeester
c03c80b1b0 Merge pull request #26299 from allencloud/support-docker-node-ps-multi-nodes 
support docker node ps multiNodes
 2016-09-23 09:50:24 +02:00
Akihiro Suda
5ce08ddfca add docker stack ls 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-22 19:31:39 +00:00
Josh Horwitz
d6bd79c18f Refactor to new events api 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-09-22 14:42:06 -04:00
Misty Stanley-Jones
7b5c3d935a Clarify usage of --force when used on a swarm manager 
Fixes #26125

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-09-21 13:05:33 -07:00
Daniel Nephin
c0699cd4a4 Merge pull request #24987 from ripcurld00d/stats_format_prod 
Add format to stats
 2016-09-21 10:38:21 -04:00
John Howard
6b74e2f09d Revert Box from HostConfig 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-20 12:01:04 -07:00
Vincent Demeester
a51967cd02 Merge pull request #26716 from dnephin/move-system-commands 
Create system  subcommand
 2016-09-20 15:54:01 +02:00
Vincent Demeester
00615efced Merge pull request #25025 from cpuguy83/service_inspect_formatter 
Add formatter for service inspect
 2016-09-20 14:49:45 +02:00
Daniel Nephin
d8c9951707 Merge pull request #26717 from dnephin/fix_experimental_commands 
Make all the experimental subcommand consistent
 2016-09-19 19:29:48 -04:00
Sebastiaan van Stijn
8c508ef813 Merge pull request #26579 from Microsoft/jjh/ociprocess 
Windows: OCI `process` struct and console size to uint
 2016-09-19 22:52:16 +02:00
Daniel Nephin
89ea589d2c Create a system subcommand for events and info. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-19 16:29:17 -04:00
Brian Goff
54ba82beab Add formatter for service inspect 
Allows the user to use `pretty` as the format string.
This enables users to put custom format options into their CLI config
just like is supported for `docker ps` and `docker images`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-09-19 16:28:19 -04:00
Daniel Nephin
6eefcea51a Make all the experimental subcommand consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-19 16:27:23 -04:00
John Howard
53774423ff Windows: OCI process struct convergence 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-19 10:34:31 -07:00
Daniel Nephin
a7c8bcac2b Only hide commands if the env variable is set. 
Better formatting for usage template.
Group commands in usage to management/operation commands.
Remove the word Docker from the description of management commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-19 13:28:15 -04:00
Daniel Nephin
dda198761b Move the search command to the registry package. 
And move it back to the top-level command.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-19 13:28:15 -04:00
Daniel Nephin
b993609d5a Move canonical image and container commands into a command group 
Hide some top level commands
Add docker container and image inspect commands.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-19 13:28:02 -04:00
Sebastiaan van Stijn
bb6fe56e88 Merge pull request #26268 from AkihiroSuda/eventsjsonl 
add `docker events --format`
 2016-09-19 17:30:27 +02:00
Boaz Shuster
96622b2a7d Add the format switch to the stats command 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2016-09-18 14:16:13 +03:00
John Howard
4a0419f536 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
 2016-09-17 09:31:24 -07:00
Sebastiaan van Stijn
94bc2b1bc0 Merge pull request #26387 from Microsoft/jjh/securityopts 
Only output security options if there are any
 2016-09-16 23:05:30 +02:00
John Howard
340e5233b2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 11:56:15 -07:00
John Howard
dd3d223a7e Only output security options if there are any 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-09-16 10:05:21 -07:00
Akihiro Suda
5af5a1be62 add docker events --format 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-09-15 09:55:29 +00:00
Yong Tang
c8dc2b156a Check bad syntax on dockerfile before building. 
This fix tries to address the issue raised in 26453 where bad syntax
on dockerfile is not checked before building, thus user has to wait
before seeing error in dockerfile.

This fix fixes the issue by evaluating all the instructions and check
syntax before dockerfile is invoked actually.

All existing tests pass.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-13 21:43:10 -07:00
Daniel Nephin
e16e9775d4 Fix testcases that expect trailing whitespace 
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin
c8336743a4 Refactor formatter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin
a07be9be38 Use opts.FilterOpt for filter flags. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 16:20:10 -04:00
Daniel Nephin
c2decbe5ee Merge pull request #24761 from WeiZhang555/parallel-stop 
Enhancement: allow parallel stop, pause, unpause
 2016-09-13 10:46:51 -04:00
Yong Tang
54976b718f Fix issue of WARNING: --size ignored for volume for docker inspect 
When `docker inspect` is invoked, it is possible to pass a flag of
`-s` for container types to display size information. If `-s` is used
for non-container types then a warning `WARNING: --size ignored for volume`
will show up.

However, currently `WARNING: --size ignored for volume` will show up even
when `-s` is not passed to `docker inspect` for non-container types.

This fix fixes this issue by checking if `-s` has been passed or not (`getSize`).
Also, since image inspect does not support `-s`, `IsSizeSupported` has been changed
to false for images.

This fix is tested manually.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-12 23:08:19 -07:00
Zhang Wei
f1dda4395e Add parallel operation support for pause/unpause 
Support parallel pause/unpause

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-13 11:01:28 +08:00
Zhang Wei
2155b46915 Enhancement: allow parallel stop 
Stop multiple containers in parallel to speed up stop process, allow
maximum 50 parallel stops.

Signed-off-by: Abhinav Dahiya <abhinavdtu2012@gmail.com>
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-13 10:50:55 +08:00
Brian Goff
e5544fbb0d Merge pull request #26103 from sakeven/fix-validate-build-arg 
validate build-arg
 2016-09-12 09:15:58 -04:00
Antonio Murdaca
e8b9f38c7e Merge pull request #26456 from dnephin/move_cli_command_registry 
Remove registry/auth helper methods from the DockerCLI object
 2016-09-12 15:11:04 +02:00
sakeven
5426510bea validate build-arg 
Signed-off-by: sakeven <jc5930@sina.cn>
 2016-09-12 18:02:21 +08:00
Vincent Demeester
4c3f2e7c37 Merge pull request #26303 from yongtang/26300-docker-images-3-fractional-digits 
Restrict size to 2 fractional digits for `docker images`
 2016-09-10 11:32:45 +02:00
Daniel Nephin
1dd46e0644 Remove remaining registry methods from DockerCLI. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 15:50:01 -04:00
Daniel Nephin
e05fa5de48 Remove cli/command/credentials 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 15:50:01 -04:00
Daniel Nephin
5d335fbda7 Remove RetrieveAuthConfigs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 15:50:01 -04:00
allencloud
af4461ad29 support docker node ps multiNodes 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-09-10 02:52:48 +08:00
Phil Estes
cf58eb437c Merge pull request #22049 from boucher/docker-checkpoint-restore 
Implement containerd API for checkpoints
 2016-09-09 13:36:55 -04:00
boucher
67f607a02f Update checkpoint comments to be more accurate 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-09 12:13:46 -04:00
Daniel Nephin
e7c9694d76 Move image trust related cli methods into the image package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-09 10:50:16 -04:00
boucher
cb0ad4258b Fix typo 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:56 -04:00
boucher
d8fef66b03 Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
 2016-09-08 21:31:52 -04:00
Yong Tang
4e7e3919ce Restrict size to 2 fractional digits for docker images 
This fix tries to address the issue raised in 26300. Previously
`docker images` will use `HumanSize()` to display the size which
has a fixed precision of 4 (thus 3 fractional digits). This
could be problematic in certain languages (e.g. , German, see
26300) as `.` may be interpreted as thousands-separator in number.

This fix use `CustomSize()` instead and limit the precision to 3
(thus 2 fractional digits).

This fix has been tested manually.

This fix fixes 26300.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-09-08 18:26:50 -07:00
Daniel Nephin
485881b038 Fix a test that expects whitespace at the end of the line. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:50:14 -04:00
Daniel Nephin
9c2b935812 Replace api/client imports with cli/command in experimental files. 
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:48 -04:00
Daniel Nephin
0640a14b4f Move api/client -> cli/command 
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:29 -04:00