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

28947 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
b24a833f81 Merge pull request #28259 from sdurrheimer/zsh-completion-node-rm-swarm-leave-force 
Add zsh completion for 'docker {node rm,swarm leave} -f'
 2016-11-10 21:52:18 +01:00
Sebastiaan van Stijn
93591faeb5 Merge pull request #28255 from sdurrheimer/zsh-completion-dockerd-seccomp-profile 
Add zsh completion for 'docker daemon --seccomp-profile'
 2016-11-10 21:51:29 +01:00
Sebastiaan van Stijn
8aa04807ad Merge pull request #28256 from sdurrheimer/zsh-completion-service-create-update-tty 
Add zsh completion for 'docker service {create,update} --tty'
 2016-11-10 21:50:29 +01:00
Sebastiaan van Stijn
c51b16f0e4 Merge pull request #28252 from sdurrheimer/zsh-completion-service-create-hostname 
Add zsh completion for 'docker service create --hostname'
 2016-11-10 21:49:02 +01:00
John Howard
f6ecfd620a Windows: Dockerfile Win 10 client note 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-11-10 12:45:56 -08:00
Steve Durrheimer
04e7fca620
Add zsh completion for 'docker {node rm,swarm leave} -f' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 21:31:34 +01:00
Steve Durrheimer
a34a41b20b
Add zsh completion for 'docker service {create,update} --tty' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 21:25:24 +01:00
Steve Durrheimer
0f324a5b15
Add zsh completion for 'docker daemon --seccomp-profile' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 21:21:25 +01:00
Brian Goff
a851cad25c Merge pull request #28254 from sdurrheimer/zsh-completion-container-create-run-cpus 
Add zsh completion for 'docker {run,create} --cpus'
 2016-11-10 15:16:19 -05:00
Victor Vieux
47dd8c7cc6 Merge pull request #28250 from sdurrheimer/zsh-completion-prune 
Add zsh completion for new prune commands
 2016-11-10 12:11:26 -08:00
Steve Durrheimer
9b02c87f7b
Add zsh completion for 'docker {run,create} --cpus' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 21:10:22 +01:00
Aaron Lehmann
41b84e0994 cli: Change autolock flag description 
This change incorporates feedback from @thaJeztah in the PR that added
the autolock flag. It changes the descriptions to be different for
"swarm init" and "swarm update" so that the boolean nature so that the
purpose of the flag in both contexts is clearer.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-10 12:05:19 -08:00
Santhosh Manohar
90bc2756ed vendor libnetwork @1861587 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-11-10 12:04:28 -08:00
Andrea Luzzardi
0ec6865713 cluster executor: Logs retrieving support. 
Plumbed the executor to the container logs backend.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2016-11-10 12:02:47 -08:00
Steve Durrheimer
ca654a417a
Add zsh completion for 'docker service create --hostname' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 21:00:17 +01:00
Victor Vieux
aef1dec9a6 update swagger and docs 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-10 11:58:15 -08:00
Victor Vieux
fc7a265258 support mounts, devices and args for docker plugin set 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-10 11:55:48 -08:00
cyli
b399d29a57 Vendor the latest swarmkit PR 
Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-10 11:53:02 -08:00
Steve Durrheimer
712445607d
Add zsh completion for new prune commands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 20:51:44 +01:00
Sebastiaan van Stijn
a2937b2013 Merge pull request #28223 from bfirsh/update-swagger 
Update swagger.yaml with recent API changes
 2016-11-10 20:49:55 +01:00
cyli
81f3e699c3 Fix an issue in the swarm unlock-key rotate test where we were never updating the 
previous generation unlock key.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-11-10 11:48:39 -08:00
Sebastiaan van Stijn
c4f1cb7791 Add Fedora 25 RPMs 
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.

Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule

Once released, the image will be updated for
GA

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-10 20:44:30 +01:00
Sebastiaan van Stijn
4705728b41 Merge pull request #28182 from msabansal/overlayexternal 
Swarm-mode overlay networking support for windows
 2016-11-10 20:42:51 +01:00
Vincent Demeester
b7ecc2e3c0 Merge pull request #28198 from sdurrheimer/zsh-completion-system-subcommand 
Add zsh completion for new 'docker system' subcommands
 2016-11-10 20:24:43 +01:00
Steve Durrheimer
9df7cdcb2e
Add zsh completion for 'docker system' subcommands 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2016-11-10 20:17:58 +01:00
Brian Goff
9a2d0bc3ad Fix uneccessary calls to volume.Unmount() 
Fixes #22564

When an error occurs on mount, there should not be any call later to
unmount. This can throw off refcounting in the underlying driver
unexpectedly.

Consider these two cases:

```
$ docker run -v foo:/bar busybox true
```

```
$ docker run -v foo:/bar -w /foo busybox true
```

In the first case, if mounting `foo` fails, the volume driver will not
get a call to unmount (this is the incorrect behavior).

In the second case, the volume driver will not get a call to unmount
(correct behavior).

This occurs because in the first case, `/bar` does not exist in the
container, and as such there is no call to `volume.Mount()` during the
`create` phase. It will error out during the `start` phase.

In the second case `/bar` is created before dealing with the volume
because of the `-w`. Because of this, when the volume is being setup
docker will try to copy the image path contents in the volume, in which
case it will attempt to mount the volume and fail. This happens during
the `create` phase. This makes it so the container will not be created
(or at least fully created) and the user gets the error on `create`
instead of `start`. The error handling is different in these two phases.

Changed to only send `unmount` if the volume is mounted.

While investigating the cause of the reported issue I found some odd
behavior in unmount calls so I've cleaned those up a bit here as well.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-11-10 14:04:08 -05:00
Andrea Luzzardi
c13bf5ba51 Merge pull request #28173 from nishanttotla/pin-images-by-digest 
Pin images by digest
 2016-11-10 10:59:28 -08:00
allencloud
48c3fcedfa change node ls and service ls api and docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-11-11 02:51:19 +08:00
Yong Tang
ea9a23ccdb Add flag --host to service create and --host-add/--host-rm to service update 
This fix tries to address 27902 by adding a flag `--host`
to `docker service create` and `--host-add/--host-rm` to
`docker service update`, so that it is possible to
specify extra `host:ip` settings in `/etc/hosts`.

This fix adds `Hosts` in swarmkit's `ContainerSpec` so that it
is possible to specify extra hosts during service creation.

Related docs has been updated.

An integration test has been added.

This fix fixes 27902.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-10 10:20:24 -08:00
Sebastiaan van Stijn
02918908af Merge pull request #28243 from andrewhsu/change-context 
use "golang.org/x/net/context" instead of "context"
 2016-11-10 19:13:56 +01:00
Ben Firshman
48af987afe
Update misc things in swagger.yaml 
Changes to docs/reference/api/docker_remote_api_v1.25.md up to
and including 2d42032225

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-10 10:10:12 -08:00
Ben Firshman
54c37ecc23
Add /plugins/{name}/set endpoint to swagger.yaml 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-10 10:10:12 -08:00
Ben Firshman
50a5f3afaf
Add prune endpoints to swagger.yaml 
Introduced in #26108

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-11-10 10:07:25 -08:00
Sandeep Bansal
6e95165679 Vendoring latest swarmkit and libnetwork 
Signed-off-by: Sandeep Bansal <msabansal@microsoft.com>
 2016-11-10 09:54:47 -08:00
msabansal
ed8ccc3046 Swarm-mode overlay networking support for windows 
Signed-off-by: msabansal <sabansal@microsoft.com>
 2016-11-10 09:54:40 -08:00
Tibor Vass
89cc35447d Merge pull request #28148 from vieux/rename_plugin_manifest 
rename plugin manifest
 2016-11-10 09:47:15 -08:00
Daniel Nephin
ef90081d44 Handle bind options and volume options 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 12:37:17 -05:00
Daniel Nephin
bd8de8d8be Restore stack deploy integration test with dab 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:19 -05:00
Aanand Prasad
aa5e7d038a Reinstate --bundle-file argument to 'docker deploy' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
eefccc25c5 Add integration test for stack deploy. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
b45581b786 Remove bundlefile 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
46ca5827f9 Remove duplication of name mangling. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
644d30369a Always use a default network if no other networks are set. 
also add network labels.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
b0efbcc34a Send warnings to stderr. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad
3d2cb23782 Default to replicated mode 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Vincent Demeester
d0117238fa Fix hostname support for compose file 
Pass the hostname from ContainerSpec to the actual container.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-10 11:28:18 -05:00
Aanand Prasad
fcad58f3c8 Handle unsupported, deprecated and forbidden properties 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
13384ba34b Add swarmkit fields to stack service. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00
Aanand Prasad
0884e3c868 Add support for service-level 'volumes' key 
Support volume driver + options
Support external volumes
Support hostname in Compose file

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-11-10 11:28:18 -05:00
Daniel Nephin
cbbc6b4d9b Convert deploy to use a compose-file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-10 11:28:18 -05:00