89cc35447d
Merge pull request #28148 from vieux/rename_plugin_manifest
...
rename plugin manifest
2016-11-10 09:47:15 -08:00
ef90081d44
Handle bind options and volume options
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 12:37:17 -05:00
bd8de8d8be
Restore stack deploy integration test with dab
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:19 -05:00
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
eefccc25c5
Add integration test for stack deploy.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
b45581b786
Remove bundlefile
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
46ca5827f9
Remove duplication of name mangling.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
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
b0efbcc34a
Send warnings to stderr.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
3d2cb23782
Default to replicated mode
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-10 11:28:18 -05:00
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
fcad58f3c8
Handle unsupported, deprecated and forbidden properties
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-10 11:28:18 -05:00
13384ba34b
Add swarmkit fields to stack service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
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
cbbc6b4d9b
Convert deploy to use a compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
ed35648151
Vendor dependencies for compose-file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-10 11:28:18 -05:00
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
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
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
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
b08b437acc
pkg/jsonmessage: Avoid undefined ANSI escape codes.
...
The ANSI escape codes \e[0A (cursor up 0 lines) and \e[0B (cursor down 0 lines)
are not well defined and are treated differently by different terminals. In
particular xterm treats 0 as a missing parameter and therefore defaults to 1,
whereas rxvt-unicode treats these escapes as a request to move 0 lines.
However the use of these codes is unnecessary and were really just hiding the
fact that we were not correctly computing diff when adding a new line. Having
added the new line to the ids map and output the corresponding \n we need to
then calculate a correct diff of 1 rather than leaving it as the default 0
(which xterm then interprets as 1). The fix is to pull the diff calculation out
of the else case and to always do it.
With this in place we can then avoid outputting escapes for moving 0 lines.
Actually diff should never be 0 to start with any more, but check to be safe.
This fixes corruption of `docker pull` seen with rxvt-unicode (and likely other
terminals in that family) seen in #28111 . Tested with rxvt-unicode
($TERM=rxvt-unicode), xterm ($TERM=xterm), mlterm ($TERM=mlterm) and aterm
($TERM=kterm).
The test cases have been updated to match the new behaviour.
Signed-off-by: Ian Campbell <ian.campbell@docker.com>
2016-11-10 14:10:47 +00:00
e60ae53802
Add Image ID & Ref to container commit event
...
Signed-off-by: Marcus Cobden <mcobden@cisco.com>
2016-11-10 10:05:25 +00:00
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
49ca91fbeb
rename plugin manifest
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-10 00:09:23 -08:00
764a9ed357
Pin image by digest on service create and update
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
2016-11-09 23:31:26 -08:00
d286734b41
Merge pull request #28224 from vieux/fix_manpages
...
fix manpages
2016-11-09 23:22:30 -08:00
9410f4cc86
update network ls docs to add SCOPE
...
Signed-off-by: erxian <evelynhsu21@gmail.com>
2016-11-10 12:18:08 +08:00
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
713cae7ca2
Remove redundant parameter and fix typos
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2016-11-10 11:05:31 +08:00
f7b27ded4a
Merge pull request #28219 from darrenstahlmsft/WindowsConflictingOptions
...
Adding more strict resource checks on Windows
2016-11-09 18:01:03 -08:00
55543c45a2
Merge pull request #28150 from AkihiroSuda/mounttmpcli
...
opts/mount: add tmpfs-specific options
2016-11-09 17:50:04 -08:00
28a1ea342d
Merge pull request #28164 from anusha-ragunathan/plugin-build
...
Add plugin create functionality.
2016-11-09 17:49:51 -08:00
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
8e701f0bd7
fix manpages
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-11-09 17:11:14 -08:00
0ed00b36ff
Adding more strict resource checks on Windows
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-09 16:29:54 -08:00
824db2c454
Document autolock/unlock/unlock-key
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:12:11 -08:00
c3c70c4bcd
Lock/unlock integration tests
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:09:01 -08:00
a6030a50c9
Add unlock key rotation
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:09:01 -08:00
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
8b1f72ad44
Add integration tests for encrypted swarm
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-09 16:09:00 -08:00
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
472ecae0d8
vendor: update errors to 839d9e91
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-09 16:09:00 -08:00
2a68f0f001
vendor: update swarmkit to bddd3f0
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-11-09 16:08:52 -08:00
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
8ffd1a370c
Merge pull request #28025 from vdemeester/swarm-mode-templating
...
Add support for swarm mode templating
2016-11-09 15:57:52 -08:00
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
5b6e1bc9e5
Add plugin create functionality.
...
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-11-09 15:23:03 -08:00
75091abe76
Merge pull request #28212 from crosbymichael/tini-deps
...
Add tini deps for deb and rpm
2016-11-09 15:20:58 -08:00
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
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
Daniel Nephin
Aanand Prasad
Vincent Demeester
Andrew Hsu
Sebastiaan van Stijn
Ian Campbell
Marcus Cobden
Victor Vieux
Nishant Totla
Victor Vieux
erxian
Brian Goff
yuexiao-wang
Darren Stahl
Aaron Lehmann
Tonis Tiigi
Jana Radhakrishnan
Anusha Ragunathan
Christopher Jones