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

28790 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tibor Vass
89cc35447d Merge pull request #28148 from vieux/rename_plugin_manifest 
rename plugin manifest
 2016-11-10 09:47:15 -08:00
Andrew Hsu
2de83a430d use "golang.org/x/net/context" instead of "context" 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-11-10 08:23:19 -08:00
Sebastiaan van Stijn
44c816a808 Merge pull request #27829 from DieterReuter/fix-aptrepo-distro-versions 
Fix creation of the APT repo directory structure for similar distros
 2016-11-10 16:23:27 +01:00
Sebastiaan van Stijn
33af4dd505 Merge pull request #28186 from yongtang/27567-follow-up-dns-options 
Add `--dns-option` to `docker run` and hide `--dns-opt`
 2016-11-10 16:20:17 +01:00
Vincent Demeester
c730a96454 Merge pull request #28233 from erxian/update-network-ls-docs 
update network ls docs to add SCOPE
 2016-11-10 16:16:13 +01:00
Vincent Demeester
7df0ed49d7 Merge pull request #28220 from tophj-ibm/test-killing-with-stop-signals 
[integration-cli] fix race condition in kill tests
 2016-11-10 10:51:38 +01:00
Victor Vieux
49ca91fbeb rename plugin manifest 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-10 00:09:23 -08:00
Victor Vieux
d286734b41 Merge pull request #28224 from vieux/fix_manpages 
fix manpages
 2016-11-09 23:22:30 -08:00
erxian
9410f4cc86 update network ls docs to add SCOPE 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2016-11-10 12:18:08 +08:00
Brian Goff
a3b0ade346 Merge pull request #28138 from dmcgowan/handle-overlay2-copy-up-bug 
Use naive diff for overlay2 when opaque copy up bug present
 2016-11-09 22:29:19 -05:00
Victor Vieux
f7b27ded4a Merge pull request #28219 from darrenstahlmsft/WindowsConflictingOptions 
Adding more strict resource checks on Windows
 2016-11-09 18:01:03 -08:00
Victor Vieux
55543c45a2 Merge pull request #28150 from AkihiroSuda/mounttmpcli 
opts/mount: add tmpfs-specific options
 2016-11-09 17:50:04 -08:00
Victor Vieux
28a1ea342d Merge pull request #28164 from anusha-ragunathan/plugin-build 
Add plugin create functionality.
 2016-11-09 17:49:51 -08:00
Victor Vieux
18a07f5991 Merge pull request #27967 from aaronlehmann/encryption 
Encryption at rest of manager keys and raft data
 2016-11-09 17:49:26 -08:00
Victor Vieux
8e701f0bd7 fix manpages 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-11-09 17:11:14 -08:00
Darren Stahl
0ed00b36ff Adding more strict resource checks on Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-11-09 16:29:54 -08:00
Aaron Lehmann
824db2c454 Document autolock/unlock/unlock-key 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:12:11 -08:00
Aaron Lehmann
c3c70c4bcd Lock/unlock integration tests 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
a6030a50c9 Add unlock key rotation 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:01 -08:00
Aaron Lehmann
0f9fc54df9 Revise swarm init/update flags, add unlocking capability 
- Neither swarm init or swarm update should take an unlock key
- Add an autolock flag to turn on autolock
- Make the necessary docker api changes
- Add SwarmGetUnlockKey API call and use it when turning on autolock
- Add swarm unlock-key subcommand

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
8b1f72ad44 Add integration tests for encrypted swarm 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
b4a667c8c4 Add support for swarm init lock and swarm unlock 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
472ecae0d8 vendor: update errors to 839d9e91 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-11-09 16:09:00 -08:00
Tonis Tiigi
2a68f0f001 vendor: update swarmkit to bddd3f0 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-11-09 16:08:52 -08:00
Sebastiaan van Stijn
f11ac963af Merge pull request #27915 from rhvgoyal/graph-create-opts 
Pass all graphdriver create() parameters in a struct
 2016-11-10 01:07:41 +01:00
Victor Vieux
8ffd1a370c Merge pull request #28025 from vdemeester/swarm-mode-templating 
Add support for swarm mode templating
 2016-11-09 15:57:52 -08:00
Jana Radhakrishnan
5ef5a4216a Merge pull request #28078 from sanimej/inspect 
Show peer nodes in network inspect for swarm overlay networks
 2016-11-09 15:33:13 -08:00
Anusha Ragunathan
5b6e1bc9e5 Add plugin create functionality. 
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
 2016-11-09 15:23:03 -08:00
Victor Vieux
75091abe76 Merge pull request #28212 from crosbymichael/tini-deps 
Add tini deps for deb and rpm
 2016-11-09 15:20:58 -08:00
Christopher Jones
de1dad7074
Add restart policy to restart policy tests 
Fixes two tests that tested containers restart policy without
actually having a restart policy

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-11-09 17:13:42 -06:00
Christopher Jones
ff42a1ab53
[integration-cli] fix race condition in kill tests 
Fixes a race condition in the kill tests where the container
would be killed but inspected before it's state changed. Fixes
this by waiting for a state change instead.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-11-09 17:00:01 -06:00
Tibor Vass
5e3d777401 Merge pull request #28002 from Microsoft/jjh/noreexec 
Windows: Allow a no-reexec option for importLayer
 2016-11-09 14:46:21 -08:00
Vincent Demeester
6212ea669b
Add support for swarm mode templating 
Wire templating support of swarmkit for the engine, in order to be used
through services.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-09 23:28:06 +01:00
Santhosh Manohar
dd9944aa64 Show peer nodes in network inspect for swarm overlay networks 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2016-11-09 13:58:04 -08:00
Sebastiaan van Stijn
9482da362c Merge pull request #28214 from albers/completion-for-28196 
Add bash completion for `docker {node rm,swarm leave} -f`
 2016-11-09 22:56:22 +01:00
Derek McGowan
64b43ed5ec
Use naive diff for overlay2 when opaque copy up bug present 
When running on a kernel which is not patched for the copy up bug
overlay2 will use the naive diff driver.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
 2016-11-09 13:42:10 -08:00
Brian Goff
9e2d4f91d4 Merge pull request #28215 from dnephin/validate-swagger-gen 
Add validate/swagger-gen
 2016-11-09 16:39:22 -05:00
Victor Vieux
643ac2f804 Merge pull request #27433 from AkihiroSuda/fix-ovl-xfs-ftype0 
overlay: warn if overlay backing fs doesn't support d_type
 2016-11-09 13:39:07 -08:00
Vincent Demeester
6e885540a2 Update swarmkit to 00890359d8bfba630824b66b848dbf7851149fef 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-11-09 22:38:24 +01:00
Sebastiaan van Stijn
5e143b5f8d Merge pull request #27794 from ehazlett/secrets 
Secret Management
 2016-11-09 22:26:53 +01:00
Vivek Goyal
b937aa8e69 Pass all graphdriver create() parameters in a struct 
This allows for easy extension of adding more parameters to existing
parameters list. Otherwise adding a single parameter changes code
at so many places.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
 2016-11-09 15:59:58 -05:00
Yong Tang
9b6b3c2076 Add --dns-option to docker run and hide --dns-opt 
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055

In #27567, `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.

This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.

This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.

This fix also updates the docs and bash/zsh completion scripts.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-11-09 12:13:25 -08:00
Daniel Nephin
be807639b0 Add validate/swagger-gen 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-11-09 14:44:16 -05:00
Harald Albers
cc0c14aab7 Add bash completion for docker {node rm,swarm leave} -f 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-11-09 11:42:18 -08:00
Michael Crosby
053738f7e2 Reorder rpm deps for changelog 
The changelog is auto generated and the comment in the generate.sh
script is a lie, these should not be in alphabetical order but
in chronological order.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-11-09 11:33:35 -08:00
Victor Vieux
f67d4b897a Merge pull request #28184 from Microsoft/jjh/user 
Windows: Plumb through user
 2016-11-09 11:32:42 -08:00
Phil Estes
8119809b68 Correct secrets permissions when userns enabled 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2016-11-09 14:27:46 -05:00
Evan Hazlett
83af60e623 fix lint issue from rebase 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2016-11-09 14:27:46 -05:00