d66614a605
Require manpages for packages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1ea9c19ffe53811931ecd3102703c3eacb22d14c
Component: engine
2016-07-22 16:34:46 -04:00
01be8b95e0
Make manpages in a conatiner.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7004f219f5d0fe99de0dadf319381d224866eb7c
Component: engine
2016-07-22 16:32:51 -04:00
97afc3bb53
Merge pull request #24934 from albers/completion-swarm-join-token
...
bash completion for `docker swarm join-token`
Upstream-commit: 771cf8380768493b0c2f2b104998347071fd12db
Component: engine
2016-07-22 11:24:25 -07:00
90fa09998c
Merge pull request #24936 from Microsoft/jjh/TestRunCleanupCmdOnEntrypoint
...
Windows: TestRunCleanupCmdOnEntrypoint for nanoserver
Upstream-commit: d602391f8a6d7679f074191d36bc8af7c5b34267
Component: engine
2016-07-22 10:25:54 -07:00
b33f7ea15a
Merge pull request #24907 from sfsmithcha/update_tutorial_swarm_token
...
updates get started with swarm to use join-token
Upstream-commit: 85fdac6e8ca66cfd03e678747d9e9fa28675712f
Component: engine
2016-07-22 19:15:41 +02:00
d557e73d7c
Merge pull request #24885 from vdemeester/24875-registrauth-with
...
Rename `--registry-auth` to `--with-registry-auth`
Upstream-commit: 97039324c0e5621f6aa2c6e1d1c809384463e4a8
Component: engine
2016-07-22 19:05:49 +02:00
86ccbc24d1
Windows: TestRunCleanupCmdOnEntrypoint for nanoserver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 0d4b8cbdac531058e76526adebb1b8258826d0cf
Component: engine
2016-07-22 09:05:38 -07:00
6cc1227a79
bash completion for docker swarm join-token
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42b4d6ebe44029155d98d623c9d51f0cda89e194
Component: engine
2016-07-22 17:39:55 +02:00
c6432ec5cc
Merge pull request #24915 from aaronlehmann/reorder-swarm-commands
...
Reorder swarm commands
Upstream-commit: b059a3b82060534a070f0081069f0d56e5ea61db
Component: engine
2016-07-22 09:29:00 -04:00
1c444ad98e
Merge pull request #24930 from thaJeztah/cleanup-completion-scripts
...
remove "secrets" from completion scripts
Upstream-commit: 19fd4b4f3a15d7605dcf9a290ae8cf3372809a3f
Component: engine
2016-07-22 09:08:11 -04:00
8ee842fee1
Merge pull request #24918 from Microsoft/jjh/badtestcomment
...
Fix incorrect test comment
Upstream-commit: 796a19a7853e72de1a2f09024a7474c61a979568
Component: engine
2016-07-22 14:30:18 +02:00
853f500703
remove "secrets" from completion scripts
...
Swarm join has been changed in f5e1f6f6880391a5a3399023cf93a3c48502e57d,
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 >
Upstream-commit: c4ab20c5f8c13d9d91dbd29fd41fc0d78f93ab0d
Component: engine
2016-07-22 14:26:21 +02:00
6a74bf400c
Merge pull request #24924 from yongtang/07222016-improve-no-manager-error
...
Update the errNoManager() to conform to `swarm join-token`
Upstream-commit: 01f38dc42c7203ab2f86e6193cfa38e84eb2389a
Component: engine
2016-07-22 12:28:29 +02:00
8a7079d20e
Merge pull request #24919 from Microsoft/jjh/TestRunLookupGoogleDNS
...
Windows: Fix TestRunLookupGoogleDNS for nanoserver
Upstream-commit: ac63413a2cdb7fbf1f063efe14104d30144e0689
Component: engine
2016-07-22 11:21:28 +02:00
3d9395068e
Make README less scabious
...
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: b2ad59e7bd78271223d0912b1717e63b269346d3
Component: engine
2016-07-22 09:43:08 +01:00
1ec535a2d9
Append --registry-auth with with
...
`--with-registry-auth` is more explicit.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8426f72107f351b769babadeabbf13f205126514
Component: engine
2016-07-22 10:38:56 +02:00
ce1e21d6ce
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 >
Upstream-commit: 3d30155735d572376500729496de657459493213
Component: engine
2016-07-22 00:32:24 -07:00
c0eb3a0124
updates get started with swarm to use join-token
...
Signed-off-by: Charles Smith <charles.smith@docker.com >
Upstream-commit: 9ac145d73621b6393be763686b06b9cf5fb22ce2
Component: engine
2016-07-21 19:53:54 -07:00
2390132a2f
Windows: Fix TestRunLookupGoogleDNS for nanoserver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 80a63e8a2126239cb06918da25b5ff22c2ad813b
Component: engine
2016-07-21 19:46:17 -07:00
345fd45d48
Fix bad test comment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b02107db8b3ead7757141584523ce9b623c24c0b
Component: engine
2016-07-21 19:39:35 -07:00
0f55365ad3
Reorder swarm commands
...
This way "join-token" appears next to "join" in the help output.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 58ba4c313b1f19dfb1d50cb32238045d7b3db91d
Component: engine
2016-07-21 18:08:41 -07:00
79e3f2c256
Merge pull request #24823 from aaronlehmann/join-tokens
...
Replace secrets with join tokens
Upstream-commit: f5e1f6f6880391a5a3399023cf93a3c48502e57d
Component: engine
2016-07-21 18:06:55 -07:00
becf5d9875
Revendor swarmkit
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: aaa0f0b246c52ef3f5ae46b413f445028b7f88fe
Component: engine
2016-07-21 15:23:03 -07:00
d1f36e2c60
Revendor engine-api
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 852091ad41127ba318ce1d382214ad2f6cab67de
Component: engine
2016-07-21 15:23:03 -07:00
b141a44de0
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 >
Upstream-commit: 2cc5bd33eef038bf5721582e2410ba459bb656e9
Component: engine
2016-07-21 15:23:03 -07:00
cafdfcad31
Merge pull request #24871 from thaJeztah/fix-wrong-case-mount-type
...
Change mount-types to lowercase
Upstream-commit: 0a8a6f2dd7850cc467244ba254d5e20555df99dc
Component: engine
2016-07-22 00:03:55 +02:00
bfc472f3e3
Merge pull request #24904 from mlaventure/update-dockerfile-containerd-commit
...
Harmonize containerd commit used by all Dockerfile
Upstream-commit: 2b3148c72027ca80dafa612a54eb0f11b1614c20
Component: engine
2016-07-21 23:18:41 +02:00
b77e9f97ce
Merge pull request #24572 from yongtang/24534-deprecation-cycle-3-releases
...
Extend deprecation cycle to 3 releases by default
Upstream-commit: 8cbe6541b2229357370e61ce6fb35d131be93cac
Component: engine
2016-07-21 21:06:57 +02:00
c363072451
Merge pull request #24874 from abronan/update_libkv
...
Vendoring libkv @v0.2.1
Upstream-commit: 8a19c13d32da5c92509a9c7b75f68af048c44495
Component: engine
2016-07-21 14:28:01 -04:00
281fb0ce0f
Merge pull request #24846 from michael-holzheu/24748-s390x-update-jessie-glibc
...
Dockerfile.s390x: Update glibc to proposed-updates 2.19-18+deb8u5
Upstream-commit: c435045c305a390d05cd9cebebb7a01a28464156
Component: engine
2016-07-21 19:44:54 +02:00
de47d59158
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 >
Upstream-commit: d5cbc57eff0df651bfbfb455608da45747651d0c
Component: engine
2016-07-21 10:34:30 -07:00
108637a2eb
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 >
Upstream-commit: 81dc97902264fe77877d32e42fdb8a57f123c2b3
Component: engine
2016-07-21 08:48:43 -04:00
bf34d0960f
Merge pull request #24892 from thaJeztah/fix-label-formatting-example
...
docs: improve formatting and highlighting of docker ps reference
Upstream-commit: 2debfe84354d306236b576a0fde665f9af5e0994
Component: engine
2016-07-21 12:38:45 +02:00
5614c24f22
Merge pull request #24700 from nishanttotla/pass-registry-auth-on-deploy
...
Send registry auth token for service deploy
Upstream-commit: 22d020276cfd6df3482523bc680c775d6a0c57ca
Component: engine
2016-07-21 12:33:33 +02:00
5dc34c3c66
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 >
Upstream-commit: 07ef0a37f85fbb3ba0be4a09bb301108bf461d96
Component: engine
2016-07-21 12:27:39 +02:00
5e5e1a3d76
Merge pull request #24884 from Microsoft/jjh/TestBuildWorkdirWindowsPath
...
Windows: TestBuildWorkdirWindowsPath hard code fix
Upstream-commit: bdf4d9c1cd5fc6f91cb5ea831dfbe62870b4ab18
Component: engine
2016-07-21 11:42:26 +02:00
acb2cc6fda
Change mount-types to lowercase
...
these values were changed to lowercase in
690cb2d08cgithub@gone.nl >
Upstream-commit: 8f93128cd619e1d11be1bc0ae21f1362b1e3f9ad
Component: engine
2016-07-21 11:25:42 +02:00
cc9d201773
Clarify API behavior when older versions are called.
...
Signed-off-by: fonglh <fonglh@gmail.com >
Upstream-commit: f62e24f697dd5c69e58f3b5d732fd5a962a0c8e6
Component: engine
2016-07-21 16:16:46 +08:00
cb69fb7ef6
Merge pull request #24870 from stevvooe/volume-opt
...
api/client/service: shorten to volume-opt
Upstream-commit: 31b3357c060156b51f1f0764e49a21e9089332e5
Component: engine
2016-07-21 09:36:06 +02:00
8be16788f7
Merge pull request #24861 from albers/completion-network-driver-macvlan
...
Add explicit support for macvlan networks to bash completion
Upstream-commit: d458abca4e37eb791e6e2efd00c6e0511c495669
Component: engine
2016-07-21 09:22:35 +02:00
9ef04f92b8
Windows: TestBuildWorkdirWindowsPath hard code fix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ceed93a874bf74baf811ed7fe9a476f25adca7b8
Component: engine
2016-07-20 21:23:38 -07:00
1cef852614
update libkv, fix wrong error check on zookeeper list
...
Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com >
Upstream-commit: 5189e3d50d66c654132a64777e437dad55176ed5
Component: engine
2016-07-20 17:25:39 -07:00
c6f6695f3d
Merge pull request #24866 from thaJeztah/fix-sloppy-copy-pasta
...
docs: fix copy/pasta error
Upstream-commit: ccd0d83344da3b4c67708465f11aa542601b6407
Component: engine
2016-07-21 02:02:28 +02:00
3087bde702
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 >
Upstream-commit: a40b5820c91640183b40e0668f6802415e6adc14
Component: engine
2016-07-20 16:08:36 -07:00
2332ccb8c3
Send registry auth token for service deploy
...
Signed-off-by: Nishant Totla <nishanttotla@gmail.com >
Upstream-commit: a26bdd8607c62e6e736d06e9ec8f0908c4808d74
Component: engine
2016-07-20 16:07:07 -07:00
0938c99ecd
Merge pull request #24563 from dperny/test-leader-election
...
Added leader election test
Upstream-commit: ea59668046e1c842b311732fc280701da1056ace
Component: engine
2016-07-20 16:02:09 -07:00
0d2e409cad
Merge pull request #24842 from thaJeztah/fix-code-highlight
...
docs: add code-hints to builder page
Upstream-commit: 8c6c1aaf07277ea09f65d79337152ba0c9833d4c
Component: engine
2016-07-21 00:06:52 +02:00
1af7b06c9a
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 >
Upstream-commit: 83b12c0c1144dc3778177fab8dc5052108388f1e
Component: engine
2016-07-20 23:59:38 +02:00
41aabc22f9
Merge pull request #24838 from thaJeztah/add-log-options-to-docs
...
Add missing --log-driver and --log-opt docs
Upstream-commit: eefc17bba10c90abfc05b26a457f99e30e9b4312
Component: engine
2016-07-20 23:50:10 +02:00
25518e4d02
Merge pull request #24864 from thaJeztah/update-plugin-docs
...
docs: update reference docs for plugins
Upstream-commit: 15ad5b5d09200bd8711e6bcd5ba9c486ba5ab8dc
Component: engine
2016-07-20 23:48:26 +02:00
