Commit Graph

24353 Commits

Author SHA1 Message Date
f4ad386d76 Fix issue with test ordering for TestParseWords
`TestParseWords` needs to use the `tokenEscape` for one of the test
cases, but `tokenEscape` was not being set unless tests ran in a
specific order.
This sets a default value for `tokenEscape`... `\`... so that tests that
rely on this global are not affected by test ordering.

This is the simplest fix for these cases. Ideally the token should not
be set as a global but rather passed down, which is a much larger
change.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: df167d3ff04cdc90012c8ca39647662ad69e6715
Component: engine
2016-07-26 10:50:12 -04:00
d2c0d3d29a Merge pull request #23844 from tjanez/docs-systemd-expand
Expand instructions on using systemd to manage containers
Upstream-commit: 42f2205184e31390fc13cc21aedf95fcc3e9e878
Component: engine
2016-07-25 14:39:45 +02:00
2b15ca3027 Merge pull request #24990 from mavenugo/rc5ln
Vendoring libnetwork for rc5
Upstream-commit: 3056e4884e470a43eb71584569d920d4abfde4d0
Component: engine
2016-07-25 11:43:59 +02:00
089e283622 Merge pull request #24988 from mavenugo/snconnect
Prevent network connect/disconnect on swarm scoped networks
Upstream-commit: cc493a52a46271df82dbebea26038502b85788b9
Component: engine
2016-07-25 10:46:45 +02:00
c56d1bfde3 Merge pull request #24991 from everett-toews/fix-AuthzPlugin
Fix AuthzPlugin URL fragment in docs
Upstream-commit: 4b94a6cb162d43f83cb06520fea24c1659be5ad9
Component: engine
2016-07-25 10:32:03 +02:00
b6548fce21 Merge pull request #24961 from jstarks/vt_th2_fix
Windows: Restore console mode on set mode failure
Upstream-commit: bff9a0556f785b094b55fcc9c1e5f83cf74a9aaa
Component: engine
2016-07-25 09:49:34 +02:00
d204454a26 Merge pull request #24977 from lixiaobing10051267/masterNote
Modify several fun notes in fsnotify.go
Upstream-commit: 1f3b400d3c92657a915610a3702cdf4012beffbd
Component: engine
2016-07-25 09:41:17 +02:00
8e3d8789cb Merge pull request #24963 from allencloud/fix-typos
fix typos
Upstream-commit: 40044cb18fd4ff0ed13d8cdd41ec4dcecdac0703
Component: engine
2016-07-25 09:39:48 +02:00
361aaddf98 Add zsh completion for 'docker swarm join-token' command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a04bba8b89f12480c4eaf0dda8f47442f99864ca
Component: engine
2016-07-25 08:39:33 +02:00
c0405374cf Fix AuthzPlugin URL fragment in docs
These docs have AuthzPlugin with a lower case 'z'. What the plugin
api is actually looking for is AuthZPlugin with an upper case 'Z'.

See 46e3a249a1/pkg/authorization/api.go (L5-L8)

Signed-off-by: Everett Toews <everett.toews@rackspace.com>
Upstream-commit: c42fbc6b0906c7ccafe5a35d9c2288f83361849d
Component: engine
2016-07-24 23:03:19 -05:00
439155a37c Vendoring libnetwork for rc5
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 56b78ab2f2871707ebdf33802a3029417b43036e
Component: engine
2016-07-24 20:08:00 -07:00
cf6ff5cc28 Prevent network connect/disconnect on swarm scoped networks
Swarm handles service updates quite differently and also it doesnt
support worker driver network operations. Hence prevent containers from
connecting to swarm scoped networks

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8f9066c468d7312af722c7cf9fc27b7c8ab79fc3
Component: engine
2016-07-24 15:34:45 -07:00
c27fc95546 Daemon changes to pass exec-root to libnetwork
This is required to make the libnetwork's namespace mgmt
directory configurable

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: d3af5e3d4bc0aadf25d571835893a9d5bead56b3
Component: engine
2016-07-24 09:23:39 -07:00
667eed7772 Require listen address and advertise address to be an IP address or an interface name
Hostnames are not supported for now because libnetwork can't use them
for overlay networking yet.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: fca0b18dcba99a7fbb8b430a55dc7bf60d5c1356
Component: engine
2016-07-24 09:23:38 -07:00
2150ea40b1 Split advertised address from listen address
There are currently problems with "swarm init" and "swarm join" when an
explicit --listen-addr flag is not provided. swarmkit defaults to
finding the IP address associated with the default route, and in cloud
setups this is often the wrong choice.

Introduce a notion of "advertised address", with the client flag
--advertise-addr, and the daemon flag --swarm-default-advertise-addr to
provide a default. The default listening address is now 0.0.0.0, but a
valid advertised address must be detected or specified.

If no explicit advertised address is specified, error out if there is
more than one usable candidate IP address on the system. This requires a
user to explicitly choose instead of letting swarmkit make the wrong
choice. For the purposes of this autodetection, we ignore certain
interfaces that are unlikely to be relevant (currently docker*).

The user is also required to choose a listen address on swarm init if
they specify an explicit advertise address that is a hostname or an IP
address that's not local to the system. This is a requirement for
overlay networking.

Also support specifying interface names to --listen-addr,
--advertise-addr, and the daemon flag --swarm-default-advertise-addr.
This will fail if the interface has multiple IP addresses (unless it has
a single IPv4 address and a single IPv6 address - then we resolve the
tie in favor of IPv4).

This change also exposes the node's externally-reachable address in
docker info, as requested by #24017.

Make corresponding API and CLI docs changes.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: a0ccd0d42fdb0dd2005f67604cb81a5a6b26787e
Component: engine
2016-07-24 09:23:07 -07:00
766d8f186d Vendor libnetwork and github.com/vishvananda/netlink
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 24d2d53f5d3c3da8480f419618c1ae0b054f4cdc
Component: engine
2016-07-24 09:22:36 -07:00
9d5822af82 Revendor swarmkit
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: d626875a94d9066617887bcee5046c5f0bdcadab
Component: engine
2016-07-24 09:22:32 -07:00
44cb49a379 Update swarm init task-history-limit docs
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 180f8c61bb1d3f05c21e697147b2f75a44bda485
Component: engine
2016-07-24 11:13:06 +02:00
aa515a37b1 Merge pull request #24957 from aluzzardi/default-history-retention
CLI: Change default Swarm task history retention limit.
Upstream-commit: ca663a400ceb122f154ca4d752a2b144642372dd
Component: engine
2016-07-24 11:11:24 +02:00
66e0358be6 Merge pull request #24932 from thaJeztah/change-to-camelBack-for-consistency
Change "rotate_worker_token" to "rotateWorkerToken"
Upstream-commit: 3742557ed49048befea88125df781d5c87131e0d
Component: engine
2016-07-24 10:05:07 +02:00
17ffda94c4 Modify several fun notes in fsnotify.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: ff2c898652de37f70cd2774a208e61b112d06e1b
Component: engine
2016-07-24 13:35:33 +08:00
7319473b2d Merge pull request #24872 from stevvooe/mount-aliases
api/client/service: mount option defaults and aliases
Upstream-commit: b8a08ddd696e2ffb3749940836406e48f1d9e2e0
Component: engine
2016-07-23 14:02:31 +02:00
8a421c2f1b Merge pull request #24954 from aboch/lnk
Fix regression on --link on bridge network
Upstream-commit: 48d0b811816fe7285644a8338c64879ecac7c2ca
Component: engine
2016-07-23 04:47:57 -07:00
569a0f5457 Merge pull request #24964 from lixiaobing10051267/masterFlushAll3
Func name wrong in notes of response.go
Upstream-commit: 05f8d51cce4a0b16b5f5143793ed73871acc2381
Component: engine
2016-07-23 11:18:03 +02:00
9afbc46586 Merge pull request #24960 from aaronlehmann/update-parallelism-docs
Update --update-parallelism docs
Upstream-commit: 8e8580c68059bbe7a2c543fc48420c4ed8763350
Component: engine
2016-07-23 10:35:34 +02:00
7ce557c2bc Func name wrong in notes of response.go
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: d6556a6ef716387122574e37cce4f009b1e21c25
Component: engine
2016-07-23 16:03:27 +08:00
1c3431e16a fix typos
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4e959ef2f7f063803d04e06166f459257eb94b5c
Component: engine
2016-07-23 11:32:23 +08:00
0744d6df7d Update --update-parallelism docs
Update documentation to account for the changes in #24952.

docs/swarm/swarm-tutorial/rolling-update.md doesn't need any changes,
but the CLI reference pages should show the current help text.
drain-node.md no longer needs to specify --update-parallelism 1 in its
example.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 933ba8d7f7f95ad0bac97c39ffb3cdf1a5634cc6
Component: engine
2016-07-22 19:07:10 -07:00
97d37a9100 Merge pull request #24952 from stevvooe/update-parallelism-default
api/client/service: default update parallelism to 1
Upstream-commit: aeea20f51e6a570b663f03e61a8c6fe77ae6ffa6
Component: engine
2016-07-22 19:03:24 -07:00
ac007a8e3c Fix regression on --link on bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 3a3f800ff48ddfa729f1db7898bf689d25a6d4cf
Component: engine
2016-07-22 18:52:46 -07:00
aaeaca1829 Windows: Restore console mode on set mode failure
SetConsoleMode() on input handles appears to remember invalid bits that
were set, causing problems for other programs (such as xcopy.exe) trying
to set the console mode after docker.exe has exited. Always restore
the input console mode on set failure.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 83c186fdd4332b8a08db715e8cb5dd1e80a56567
Component: engine
2016-07-22 18:34:15 -07:00
12c579731c CLI: Change default Swarm task history retention limit.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: d97c0a1f253fe61957047ea4b21d9e764dc7d783
Component: engine
2016-07-22 18:09:54 -07:00
c4a861fdf5 api/client/service: default update parallelism to 1
When updates happen, the current behavior is to kill all running
instances and dispatch new tasks. Common use cases for container updates
involve small numbers of containers, meaning the app will go down on
most updates. Setting parallelism to 1 ensures that at most one task
will go down during the update. Services with higher replica counts can
increase this number accordingly to meet their needs.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 67246afd3dbcb53fea470bd3e45578370207139d
Component: engine
2016-07-22 17:13:58 -07:00
48d89793f8 Remove "secrets" leftovers from docs
f5e1f6f6880391a5a3399023cf93a3c48502e57d replaced "secrets"
with "join tokens", which also removed the "auto-accept"
policy.

This removes some remaining references to those features.

Note that there are other references, but those
are already addressed in another pull request.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 987511712f0cee391c8296b7f789c71e91561773
Component: engine
2016-07-23 01:28:20 +02:00
aa4833cce5 bump engine-api to ebb728a1346926edc2ad9418f9b6045901810b20
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9a3e47511ab9faac599b8f085a1b755ec941e49c
Component: engine
2016-07-23 01:05:45 +02:00
411f901924 Change "rotate_worker_token" to "rotateWorkerToken"
This renames the `rotate_xxx` flags to camelBack, for
consistency with other API query-params, such as
`detachKeys`, `noOverwriteDirNonDir`, and `fromImage`.

Also makes this flag accept a wider range of boolean
values ("0", "1", "true", "false"), and throw an error
if an invalid value is passed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bd81df12780b0765e55582574eaa2a125adf65fa
Component: engine
2016-07-23 01:04:12 +02: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