Commit graph

27228 commits

Author SHA1 Message Date
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
Tõnis Tiigi
9b0aaccf55 Merge pull request #26543 from dnephin/fix_filter_args
Use opts.FilterOpt for filter flags
2016-09-13 14:36:51 -07:00
Anusha Ragunathan
8aa454dfc8 Merge pull request #26216 from vieux/plugin_manifest
add some plugin manifest reference doc
2016-09-13 14:03:20 -07: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
Brian Goff
b4c1645db5 Merge pull request #22373 from cpuguy83/add_mounts_api_on_create
Add new `HostConfig` field, `Mounts`.
2016-09-13 14:39:50 -04:00
Tõnis Tiigi
711455d34e Merge pull request #26503 from clnperez/swarm-test-move-err-check
swarm: always check err before http status in tests
2016-09-13 10:53:55 -07:00
Alexander Morozov
85c3b8c1b1 Merge pull request #26433 from Microsoft/jjh/fix24819
Windows: Fix regression pulling linux images
2016-09-13 08:35:38 -07: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
Brian Goff
29b1c1da73 Migrate old mount format to use mount specs
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-13 09:55:35 -04:00
Brian Goff
fc7b904dce Add new HostConfig field, Mounts.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).

The new API follows exactly the services mount API.

Example usage of `Mounts`:

```
$ curl -XPOST localhost:2375/containers/create -d '{
  "Image": "alpine:latest",
  "HostConfig": {
    "Mounts": [{
      "Type": "Volume",
      "Target": "/foo"
      },{
      "Type": "bind",
      "Source": "/var/run/docker.sock",
      "Target": "/var/run/docker.sock",
      },{
      "Type": "volume",
      "Name": "important_data",
      "Target": "/var/data",
      "ReadOnly": true,
      "VolumeOptions": {
	"DriverConfig": {
	  Name: "awesomeStorage",
	  Options: {"size": "10m"},
	  Labels: {"some":"label"}
	}
      }]
    }
}'
```

There are currently 2 types of mounts:

  - **bind**: Paths on the host that get mounted into the
    container. Paths must exist prior to creating the container.
  - **volume**: Volumes that persist after the
    container is removed.

Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-09-13 09:55:35 -04:00
Vincent Demeester
675144ff8d Merge pull request #26514 from AkihiroSuda/fix-pkg-integration-race
[test] fix races in pkg/integration/cmd
2016-09-13 15:18:41 +02:00
Brian Goff
04c189fa49 Merge pull request #26517 from yongtang/26493-inspect-size
Fix issue of `WARNING: --size ignored for volume` for `docker inspect`
2016-09-13 08:59:12 -04:00
Sebastiaan van Stijn
8754dc398e Merge pull request #26515 from AkihiroSuda/improve-ckpt-doc
[doc] add current limitation to experimental/checkpoint-restore.md
2016-09-13 14:55:18 +02:00
Sebastiaan van Stijn
027e7be348 Merge pull request #25817 from sfsmithcha/update_glossary
add swarm mode terms to the glossary
2016-09-13 12:08:32 +02:00
Sebastiaan van Stijn
4d187df277 Merge pull request #25466 from justincormack/deprecate-maintainer
Begin process of deprecating MAINTAINER
2016-09-13 12:07:04 +02:00
Justin Cormack
379b02b48d Merge pull request #26518 from SUSE/dont-write-aa-profile-to-etc
apparmor: do not save profile to /etc/apparmor.d
2016-09-13 10:37:11 +01:00
Vincent Demeester
0c90f777b7 Merge pull request #26489 from yuexiao-wang/update-exec
update option for docker exec
2016-09-13 11:16:22 +02:00
Vincent Demeester
eb0728a993 Merge pull request #26439 from lixiaobing10051267/masterReload
fix logruns.Warnf while daemon.networkOptions fails
2016-09-13 11:03:52 +02:00
Vincent Demeester
0deae9f2fa Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
Add zsh completion for 'service {create,update} --group-{add,rm}'
2016-09-13 10:18:27 +02:00
Steve Durrheimer
1df220d51f
Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-09-13 10:15:22 +02:00
Aleksa Sarai
2f7596aaef
apparmor: do not save profile to /etc/apparmor.d
Writing the profile to /etc/apparmor.d, while also manually loading it
into the kernel results in quite a bit of confusion. In addition, it
means that people using apparmor but have /etc mounted read-only cannot
use apparmor at all on a Docker host.

Fix this by writing the profile to a temporary directory and deleting it
after it's been inserted.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-09-13 16:25:16 +10: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
Akihiro Suda
d1c910af38 add current limitation to experimental/checkpoint-restore.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-13 05:14:41 +00:00
Akihiro Suda
e17f77ec51 fix races in pkg/integration/cmd
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-09-13 04:23:36 +00: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
lixiaobing10051267
56916b5e8d fix logruns.Warnf while daemon.networkOptions fails
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
2016-09-13 09:17:39 +08:00
Justin Cormack
6fafd07282 Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
2016-09-12 23:56:41 +01:00
Tõnis Tiigi
6a50b673eb Merge pull request #26499 from LK4D4/health_containerd
libcontainerd: use healthcheck to track containerd conn
2016-09-12 15:52:48 -07:00
Alexander Morozov
036a8f77b0 Merge pull request #26461 from crosbymichael/term-exec
Add TERM env var to exec
2016-09-12 14:57:37 -07:00
Sebastiaan van Stijn
056bd44f6b Merge pull request #26508 from docker/stevvooe-patch-1
issues: re-order issue template for more clarity
2016-09-12 23:43:55 +02:00
Stephen Day
be3bc483c6
issues: re-order issue template for more clarity
Triaging issues has become a little challenging since the meat
of the information is below a large amount of unstructured
command line output. These changes add a description and move
the reproduction and expected/received results above the
unstructured output.

This should help for initial triaging, as well as self-triaging.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2016-09-12 14:34:00 -07:00
Alexander Morozov
e4ddcb37c1 libcontainerd: use healthcheck to track containerd conn
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-09-12 14:22:38 -07:00
Sebastiaan van Stijn
6edf09cf58 Merge pull request #26488 from vdemeester/26450-add-client-package-readme
Add a README to the client's package…
2016-09-12 22:56:32 +02:00
Sebastiaan van Stijn
23d5b3be9b Merge pull request #26460 from icecrime/update_issue_triage
Update issue labels
2016-09-12 20:35:59 +02:00
Anusha Ragunathan
a4d1365bce Merge pull request #25794 from chenchun/timeout
Add default timeout to pkg/plugins/client
2016-09-12 11:27:36 -07:00
Christy Perez
3dea5dbb9a Always check err before http status
A test failed expecting 200, but received -1, which is an err rc,
not an HTTP status code, so move these checks up.

Also log the output an not just check for a nil err.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-09-12 12:45:08 -05:00
Riyaz Faizullabhoy
40f823ccd8 Use latest version of notary server in trust sandbox docs
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2016-09-12 09:42:12 -07:00
Michael Crosby
4633f15f13 Add TERM env var to exec
When the `-t` flag is passed on exec make sure to add the TERM env var
to mirror the expected configuration from run.

Fixes #9299

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-09-12 09:20:27 -07:00
Arnaud Porterie (icecrime)
19f0feadd6
Update issue labels
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-09-12 08:56:04 -07: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
Brian Goff
e41839e8a1 Merge pull request #26472 from yongtang/09112016-docker-build-step-0
Fix documentation for `Step 0` to `Step 1` in `docker build`
2016-09-12 09:08:35 -04:00
Vincent Demeester
ab2c9b373d Merge pull request #26483 from miaoyq/optimized-debug-print-in-devicemapper
Optimized debug print in the 'deviceset.go'
2016-09-12 15:08:12 +02:00
Brian Goff
5ada5f129f Merge pull request #26301 from albers/completion-service-groups
Add bash completion for `service {create,update} --group-{add,rm}`
2016-09-12 09:05:49 -04:00
Vincent Demeester
e391e83804 Merge pull request #26481 from AkihiroSuda/nit-fix-convention-26467
[nit] test: fix trivial code convention noncompliance
2016-09-12 15:03:29 +02:00
yuexiao-wang
7084aa24c7 update option for docker commands
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-09-12 19:10:45 +08:00
sakeven
5426510bea validate build-arg
Signed-off-by: sakeven <jc5930@sina.cn>
2016-09-12 18:02:21 +08:00
Vincent Demeester
a00106f9a5
Add a README to the client's package…
… taken from the old engine-api project.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-09-12 11:41:11 +02:00