effda473ed
Set a global orchestrator flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5d375b348a
2017-12-28 14:40:10 +01:00
d7b5fca8a7
Update golang.org/x/net to not panic
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 12c0825a4c
2017-12-28 14:40:09 +01:00
dcfd719f61
Error out on orchestrator command that don't support k8s yet
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1a2244e384
2017-12-26 11:46:59 +01:00
f4626b5de8
Move e2e test on version command to unit tests
...
* Refactor a little version command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: ba5d0d8ff5
2017-12-26 11:46:59 +01:00
1d466a29ee
Update vendoring
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61713c42a4
2017-12-26 11:45:56 +01:00
65271c3145
Fix e2e test (and add a comment that it's not the best fix)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 3a01d6a40a
2017-12-26 11:45:56 +01:00
b5273bceed
Update warning
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f5073f81d2
2017-12-26 11:45:56 +01:00
507de4363e
add kubernetes/ README
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0b5883f953
2017-12-26 11:45:56 +01:00
1e23b82bb7
Take @nass review into account
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b5170bde03
2017-12-26 11:45:56 +01:00
baa35d70b2
Refactor stack command
...
- Define command and subcommands only once
- Use annotations for k8s or swarm specific flags or subcommands
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dedd0db51a
2017-12-26 11:45:56 +01:00
cbbf94a252
Move cli/command/orchestrator to cli/command
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0508c09494
2017-12-26 11:25:22 +01:00
1ebc428804
Move /cli/command/stack/kubernetes/api to /kubernetes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f960d2d5f3
2017-12-26 11:22:32 +01:00
4dba81f210
Fix some build failures
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1ff277ad8f
2017-12-26 11:22:32 +01:00
4b3a19ed1e
Add support for kubernetes in docker cli
...
- Add support for kubernetes for docker stack command
- Update to go 1.9
- Add kubernetes to vendors
- Print orchestrator in docker version command
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 8417e49792
2017-12-26 11:22:32 +01:00
2ac4f6cd3a
Merge pull request #758 from vdemeester/experimental-cli
...
Add support for experimental Cli configuration
Upstream-commit: 70db7cc0fc
2017-12-22 14:56:40 +01:00
2a46f74679
Add support for experimental Cli configuration
...
Allow to mark some commands and flags experimental on cli (i.e. not
depending to the state of the daemon). This will allow more flexibility
on experimentation with the cli.
Marking `docker trust` as cli experimental as it is documented so.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 84fe1a1b5b
2017-12-22 14:48:47 +01:00
618f1e2388
Merge pull request #761 from sourabhtk37/patch-1
...
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
Upstream-commit: ebb8927a2a
2017-12-21 11:43:21 +01:00
7fa76a7822
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
...
The description for capabilities are mismatched for MAC_ADMIN and MAC_OVERRIDE.
Signed-off-by: T K Sourabh <sourabhtk37@gmail.com >
Upstream-commit: afcc78aae3
2017-12-21 16:06:32 +05:30
87487ae8dd
Merge pull request #759 from mistyhacks/link-to-attack-surface
...
Fix typo in link
Upstream-commit: 2f3b13742f
2017-12-21 08:33:16 +01:00
1f700eda21
Fix typo in link
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 946cb0d4fd
2017-12-20 15:35:22 -08:00
04606e240e
Merge pull request #757 from pszczekutowicz/master
...
Return errors from client in stack deploy configs
Upstream-commit: 2b8eb23b8c
2017-12-19 11:05:49 +01:00
3e7449957b
Return errors from client in stack deploy configs
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com >
Upstream-commit: a30dd1b6f3
2017-12-18 21:34:04 +01:00
a67c7bc0ee
Merge pull request #713 from albers/completion-512
...
Fix #512 Bash autocompletion works incorrect with inspect
Upstream-commit: 718a245b6e
2017-12-15 16:33:41 -05:00
5e5a802f6b
Merge pull request #753 from thaJeztah/image-shortid
...
Updated deprecation status for "repository:shortid"
Upstream-commit: 69b11daa77
2017-12-15 01:35:11 -08:00
ba6f88e84d
Merge pull request #749 from albers/completion--generic-resource
...
Add support for generic resources to bash completion
Upstream-commit: 8684b99923
2017-12-15 01:08:42 -08:00
edf70bdb82
Add support for generic resources to bash completion
...
Adds bash completion for
- `service create --generic-resource`
- `service update --generic-resource-(add|rm)`
- `dockerd --node-generic-resource`
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8ec80eec67
2017-12-15 08:56:14 +01:00
e653cda753
Merge pull request #751 from ktrysmt/fix/zsh-completions
...
Fix error in zsh completion script for docker exec
Upstream-commit: ee3ffd6540
2017-12-14 14:33:04 -08:00
14b537bf91
Updated deprecation status for "repository:shortid"
...
The `repository:shortid` syntax for referencing images is very little used,
collides with with tag references can be confused with digest references.
The `repository:shortid` notation was deprecated in Docker 1.13, and scheduled
for removal in Docker 17.12.
This patch updates the deprecation status for this feature.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 1a21ca12a6
2017-12-14 14:23:17 -08:00
5b55002724
Merge pull request #754 from thaJeztah/fix-on-failure
...
Fix "on-failure" restart policy being documented as "failure"
Upstream-commit: 1d54f30cbb
2017-12-14 14:20:43 -08:00
3ac0d82798
Fix "on-failure" restart policy being documented as "failure"
...
Commit ddadd3db49github@gone.nl >
Upstream-commit: 43217d7332
2017-12-14 13:50:56 -08:00
05b6e11768
Merge pull request #748 from thaJeztah/fix-storage-driver-anchors
...
Fix anchors to "Storage driver options"
Upstream-commit: 6a2b9d0267
2017-12-13 09:53:05 -08:00
f1310bd820
Fixed #750
...
Signed-off-by: Kotaro Yoshimatsu <kotaro.yoshimatsu@gmail.com >
Upstream-commit: db05d8ad79
2017-12-13 17:45:14 +09:00
faf7b2e58e
Merge pull request #747 from thaJeztah/17.12-update-deprecated
...
Update docs and completion-scripts for deprecated features
Upstream-commit: 619c40fac5
2017-12-13 00:02:26 -08:00
0810853589
Merge pull request #746 from lachlancooper/master
...
Correct references to --publish long syntax in docs
Upstream-commit: 29ae8cf0e0
2017-12-12 17:31:09 -08:00
ea904b1a94
Fix anchors to "Storage driver options"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 630f8b1254
2017-12-12 17:27:05 -08:00
ee5a10619c
Update docs and completion-scripts for deprecated features
...
- the `--disable-legacy-registry` daemon flag was removed
- duplicate keys with conflicting values for engine labels
now produce an error instead of a warning.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a119e39f0c
2017-12-12 17:09:38 -08:00
467a8bb243
Correct references to --publish long syntax in docs
...
This is the same issue as described at docker/docker.github.io#5370
Signed-off-by: Lachlan Cooper <lachlancooper@gmail.com >
Upstream-commit: 90f44e564b
2017-12-13 10:25:43 +11:00
1aec0724c8
Merge pull request #743 from dnephin/compose-add-name-to-network
...
Fix external networks in stacks
Upstream-commit: eb5e32e78c
2017-12-11 19:26:55 -08:00
29bb8562cc
Fix external networks
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9da2602f38
2017-12-11 11:29:49 -05:00
04040622fb
Merge pull request #741 from thaJeztah/bump-version
...
Bump version to 18.01-dev
Upstream-commit: 29d3510d50
2017-12-08 09:04:04 +01:00
c3b54b0b2b
Bump version to 18.01-dev
...
The 17.12.0-rc1 release was cut-off from commit
ace5417954github@gone.nl >
Upstream-commit: c4875264a3
2017-12-07 13:58:06 -08:00
d7a82cda3b
Merge pull request #736 from tiborvass/platform-version
...
Add platform and its components to docker version output
Upstream-commit: ace5417954
2017-12-06 17:31:05 -08:00
b8234e6bfc
Sort component details in template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7138d6e301
2017-12-07 02:04:10 +01:00
aa9a4c4bff
Add platform and its components to docker version output
...
The Server section of version output is now composed of an Engine
component and potentially more, based on what the /version endpoint
returns.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 5f4c5f8bb6
2017-12-07 02:04:10 +01:00
29d0c2b494
vendor moby api to get new version types
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fe3941af7d
2017-12-07 02:04:10 +01:00
c3ea8d4b44
Merge pull request #726 from albers/completion-log-opt-line-only
...
Add bash completion for `--log-opt line-only`
Upstream-commit: 8053cf67e0
2017-12-06 16:04:26 -08:00
499d1359a4
Merge pull request #730 from BretFisher/729-fix-zsh-node-and-stack-names
...
Fixing zsh column finding in nodes and stacks.
Upstream-commit: 143f9f0336
2017-12-06 16:03:20 -08:00
9d2c3018e2
Merge pull request #733 from thaJeztah/sync-runc
...
Bump runc to b2567b37d7b75eb4cf325b77297b140ea686ce8f
Upstream-commit: ddec67c34e
2017-12-06 16:46:33 -05:00
dced91d6f0
Merge pull request #734 from shin-/schema_35_build_shm_size
...
Add shm_size property to build configuration in Compose schema
Upstream-commit: 4a4db7f20c
2017-12-06 13:35:14 -08:00
f0f2c2b953
Add missing additionalProperties marker on mount definitions
...
Signed-off-by: Joffrey F <joffrey@docker.com >
Upstream-commit: 88bbaca294
2017-12-06 12:37:38 -08:00
