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

25931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
b059a3b820 Merge pull request #24915 from aaronlehmann/reorder-swarm-commands 
Reorder swarm commands
 2016-07-22 09:29:00 -04:00
Brian Goff
19fd4b4f3a Merge pull request #24930 from thaJeztah/cleanup-completion-scripts 
remove "secrets" from completion scripts
 2016-07-22 09:08:11 -04:00
Sebastiaan van Stijn
796a19a785 Merge pull request #24918 from Microsoft/jjh/badtestcomment 
Fix incorrect test comment
 2016-07-22 14:30:18 +02:00
Sebastiaan van Stijn
c4ab20c5f8
remove "secrets" from completion scripts 
Swarm join has been changed in f5e1f6f688,
removing various options and the "node accept" command.

This removes the removed options from the completion
scripts.

NOTE: a new command ("docker swarm join-token") was
also added, but is not part of this commit.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-22 14:26:21 +02:00
Sebastiaan van Stijn
01f38dc42c Merge pull request #24924 from yongtang/07222016-improve-no-manager-error 
Update the errNoManager() to conform to `swarm join-token`
 2016-07-22 12:28:29 +02:00
Sebastiaan van Stijn
ac63413a2c Merge pull request #24919 from Microsoft/jjh/TestRunLookupGoogleDNS 
Windows: Fix TestRunLookupGoogleDNS for nanoserver
 2016-07-22 11:21:28 +02:00
Sebastiaan van Stijn
de7d2b43a6 Merge pull request #24925 from justincormack/mange 
Make README less scabious
 2016-07-22 10:53:17 +02:00
Justin Cormack
b2ad59e7bd Make README less scabious 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-07-22 09:43:08 +01:00
Yong Tang
3d30155735 Update the errNoManager() to conform to swarm join-token 
In 24823, `swarm join` has been updated to take a `--token`
flag and flag `--manager` has been removed. Though in errNoManager()
the error message still use the old description.

This fix update the error message in errNoManager() and conforms
to the current available flags.

This fix is related to 24823.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-07-22 00:32:24 -07:00
John Howard
80a63e8a21 Windows: Fix TestRunLookupGoogleDNS for nanoserver 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-21 19:46:17 -07:00
John Howard
b02107db8b Fix bad test comment 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-21 19:39:35 -07:00
Aaron Lehmann
58ba4c313b Reorder swarm commands 
This way "join-token" appears next to "join" in the help output.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-21 18:08:41 -07:00
Tibor Vass
f5e1f6f688 Merge pull request #24823 from aaronlehmann/join-tokens 
Replace secrets with join tokens
 2016-07-21 18:06:55 -07:00
Aaron Lehmann
aaa0f0b246 Revendor swarmkit 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-21 15:23:03 -07:00
Aaron Lehmann
852091ad41 Revendor engine-api 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-21 15:23:03 -07:00
Aaron Lehmann
2cc5bd33ee Replace secrets with join tokens 
Implement the proposal from
https://github.com/docker/docker/issues/24430#issuecomment-233100121

Removes acceptance policy and secret in favor of an automatically
generated join token that combines the secret, CA hash, and
manager/worker role into a single opaque string.

Adds a docker swarm join-token subcommand to inspect and rotate the
tokens.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-07-21 15:23:03 -07:00
Sebastiaan van Stijn
0a8a6f2dd7 Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type 
Change mount-types to lowercase
 2016-07-22 00:03:55 +02:00
Sebastiaan van Stijn
2b3148c720 Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit 
Harmonize containerd commit used by all Dockerfile
 2016-07-21 23:18:41 +02:00
Sebastiaan van Stijn
8cbe6541b2 Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases 
Extend deprecation cycle to 3 releases by default
 2016-07-21 21:06:57 +02:00
Brian Goff
8a19c13d32 Merge pull request #24874 from abronan/update_libkv 
Vendoring libkv @v0.2.1
 2016-07-21 14:28:01 -04:00
Sebastiaan van Stijn
c435045c30 Merge pull request #24846 from michael-holzheu/24748-s390x-update-jessie-glibc 
Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5
 2016-07-21 19:44:54 +02:00
Kenfe-Mickael Laventure
d5cbc57eff Harmonize containerd commit used by all Dockerfile 
When #24648 was merged, only the main Dockerfile was updated with the
new containerd commit, this commit brings the other Dockerfile up to
speed.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-07-21 10:34:30 -07:00
Michael Holzheu
81dc979022 Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5 
The glibc of Debian Jessie contains the following two bugs:

 https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
 https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e

The CI tests hang because the bugs affect the gccgo runtime of the
s390x/gcc images.

Now the fixes have been integrated to glibc 2.19-18+deb8u5 in
"proposed-updates" for Debian Jessie:

 https://anonscm.debian.org/cgit/pkg-glibc/glibc.git/log/?h=jessie
 https://release.debian.org/proposed-updates/stable.html

It is expected that the package should be part of the next stable point
release (8.6) in about one to two months from now.

In order to enable CI for s390x earlier, we now explicitely update
the glibc in Dockerfile.s390x to the proposed-updates version.

After Debian 8.6 is released we can remove this change again.

Closes #24748

Suggested-by: Tianon Gravi <admwiggin@gmail.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
 2016-07-21 08:48:43 -04:00
Sebastiaan van Stijn
2debfe8435 Merge pull request #24892 from thaJeztah/fix-label-formatting-example 
docs: improve formatting and highlighting of docker ps reference
 2016-07-21 12:38:45 +02:00
Vincent Demeester
22d020276c Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy 
Send registry auth token for service deploy
 2016-07-21 12:33:33 +02:00
Sebastiaan van Stijn
07ef0a37f8
docs: improve formatting and highlighting of docker ps reference 
this improves the formatting, and code-highlighting
of the `docker ps` reference page, and wraps sentences
to 80 chars

also adds single quotes around the formatting
example for labels.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-21 12:27:39 +02:00
Sebastiaan van Stijn
bdf4d9c1cd Merge pull request #24884 from Microsoft/jjh/TestBuildWorkdirWindowsPath 
Windows: TestBuildWorkdirWindowsPath hard code fix
 2016-07-21 11:42:26 +02:00
Sebastiaan van Stijn
8f93128cd6
Change mount-types to lowercase 
these values were changed to lowercase in
690cb2d08c,
but not changed accordingly in docker/docker.

this changes the mounttypes to lowercase

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-21 11:25:42 +02:00
Vincent Demeester
392c546a6a Merge pull request #24888 from fonglh/docs-open-schema-wording 
Clarify API behavior when older versions are called.
 2016-07-21 10:39:21 +02:00
fonglh
f62e24f697 Clarify API behavior when older versions are called. 
Signed-off-by: fonglh <fonglh@gmail.com>
 2016-07-21 16:16:46 +08:00
Vincent Demeester
31b3357c06 Merge pull request #24870 from stevvooe/volume-opt 
api/client/service: shorten to volume-opt
 2016-07-21 09:36:06 +02:00
Vincent Demeester
d458abca4e Merge pull request #24861 from albers/completion-network-driver-macvlan 
Add explicit support for macvlan networks to bash completion
 2016-07-21 09:22:35 +02:00
John Howard
ceed93a874 Windows: TestBuildWorkdirWindowsPath hard code fix 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-07-20 21:23:38 -07:00
Alexandre Beslic
5189e3d50d update libkv, fix wrong error check on zookeeper list 
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
 2016-07-20 17:25:39 -07:00
Sebastiaan van Stijn
ccd0d83344 Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta 
docs: fix copy/pasta error
 2016-07-21 02:02:28 +02:00
Stephen J Day
a40b5820c9
api/client/service: shorten to volume-opt 
`volume-driver-opt` was too verbose for its own existence and the sanity
of those in the vicinity. The much better, sleeker `volume-opt` replaces
it. 7 bytes and a case of carpal tunnel syndrome are saved!

Signed-off-by: Stephen J Day <stephen.day@docker.com>
 2016-07-20 16:08:36 -07:00
Nishant Totla
a26bdd8607
Send registry auth token for service deploy 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2016-07-20 16:07:07 -07:00
Tõnis Tiigi
ea59668046 Merge pull request #24563 from dperny/test-leader-election 
Added leader election test
 2016-07-20 16:02:09 -07:00
Sebastiaan van Stijn
8c6c1aaf07 Merge pull request #24842 from thaJeztah/fix-code-highlight 
docs: add code-hints to builder page
 2016-07-21 00:06:52 +02:00
Sebastiaan van Stijn
83b12c0c11
docs: fix copy/pasta error 
Looks like I copied from the line below, not
from the output :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 23:59:38 +02:00
Sebastiaan van Stijn
eefc17bba1 Merge pull request #24838 from thaJeztah/add-log-options-to-docs 
Add missing --log-driver and --log-opt docs
 2016-07-20 23:50:10 +02:00
Sebastiaan van Stijn
15ad5b5d09 Merge pull request #24864 from thaJeztah/update-plugin-docs 
docs: update reference docs for plugins
 2016-07-20 23:48:26 +02:00
Sebastiaan van Stijn
9d532b5e2d
docs: update reference docs for plugins 
the output/response slightly changed in
340964db1c,
and `:latest` is no longer required for
various actions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-07-20 23:37:55 +02:00
Sebastiaan van Stijn
4b7a83dbce Merge pull request #24853 from Microsoft/jjh/nanoserver 
Windows: Allow nanoserver image for CLI
 2016-07-20 22:50:08 +02:00
Harald Albers
6c98d5bfac Add manual support for macvlan networks to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-20 13:13:14 -07:00
Vincent Demeester
81ef36c980 Merge pull request #24820 from sfsmithcha/add_how_swarm_works_guide 
add how nodes work to how swarm works guide
 2016-07-20 22:08:31 +02:00
Brian Goff
053a4b844a Merge pull request #24859 from albers/completion-syslog-driver-options 
Update completions for syslog log driver options
 2016-07-20 15:47:48 -04:00
Brian Goff
eddb3a2020 Merge pull request #24024 from AkihiroSuda/buildcache2 
mount .go-pkg-cache for DOCKER_INCREMENTAL_BINARY
 2016-07-20 15:37:39 -04:00
Charles Smith
137261f97c add how nodes work to how swarm works guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-07-20 12:37:38 -07:00
Harald Albers
492fdf1f57 Update completions for syslog log driver options 
Signed-off-by: Harald Albers <github@albersweb.de>
 2016-07-20 12:35:04 -07:00