Sebastiaan van Stijn
6169dab4e0
Merge pull request #789 from mistyhacks/load-supports-gzip
...
docker load supports tar and tar.gz files
Upstream-commit: 6764ce922a
Component: cli
2018-01-06 13:23:34 +01:00
Misty Stanley-Jones
d0f281be92
docker load supports tar and tar.gz files
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: ac7a5650f0
Component: cli
2018-01-05 20:33:31 -08:00
Sebastiaan van Stijn
e6a8744081
Merge pull request #785 from friism/make-config-wording-more-consistent
...
use 'config' over 'configuration file'
Upstream-commit: a60bdf3bc8
Component: cli
2018-01-05 22:26:48 +01:00
Michael Friis
1bed718e52
use 'config' over 'configuration file'
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 99e3b4cd93
Component: cli
2018-01-05 13:19:53 -08:00
Sebastiaan van Stijn
0e6233fd86
Merge pull request #681 from mistyhacks/expose-no-protocol
...
Document EXPOSE UDP syntax
Upstream-commit: 6f09f48bf1
Component: cli
2018-01-05 21:39:21 +01:00
Misty Stanley-Jones
40052b6ec6
Document EXPOSE UDP syntax
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: db572ec4ab
Component: cli
2018-01-04 16:16:06 -08:00
Daniel Nephin
8322194c96
Merge pull request #781 from thaJeztah/fix-autogenerated-formatting
...
Fix gofmt for auto-generated k8s code
Upstream-commit: 220c50abc1
Component: cli
2018-01-04 11:23:32 -05:00
Sebastiaan van Stijn
c08c5639be
Merge pull request #784 from kizzie/fix/html-for-table
...
Correct table html with close tag for </thead>
Upstream-commit: 2a4c1ef0c1
Component: cli
2018-01-04 17:12:47 +01:00
Kat
e4754a59e3
Correct table html with close tag for </thead>
...
Signed-off-by: Kat Samperi <kat.samperi@gmail.com >
Upstream-commit: 57372d18ca
Component: cli
2018-01-04 15:01:28 +00:00
Sebastiaan van Stijn
39c64668e4
Fix gofmt for auto-generated k8s code
...
This code kept being modified by my IDE, so fixing
the formatting.
This is auto-generated code, but the code to generate
is not in this repository, so this is a temporary fix
until the code-generation upstream is fixed :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bb01064691
Component: cli
2018-01-03 23:57:23 +01:00
Vincent Demeester
9f589817fd
Merge pull request #721 from silvin-lubecki/kube
...
Add kubernetes support to docker/cli
Upstream-commit: e708c900f8
Component: cli
2018-01-03 17:20:43 +01:00
Silvin Lubecki
17341a3ddc
Check and return error while creating kubernetes secret and config maps.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 18c44e0829
Component: cli
2018-01-03 15:46:19 +01:00
Silvin Lubecki
3e3e540e8d
Fix PR comments
...
- More strict on orchestrator flag
- Make orchestrator flag more explicit as experimental
- Add experimentalCLI annotation on kubernetes flags
- Better kubeconfig error message
- Prefix service name with stackname in ps and services stack subcommands
- Fix yaml documentation
- Fix code coverage ignoring generated code
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f1b116179f
Component: cli
2018-01-03 10:23:32 +01:00
Vincent Demeester
9c63a8a5b6
Merge pull request #774 from apkd/master
...
Fix description of filter flag in prune commands
Upstream-commit: 1a64b1b799
Component: cli
2018-01-02 20:02:20 +01:00
apkd
257633843b
Fix description of filter flag in prune commands
...
The "-f" flag is an alias for --force, not --filter (as correctly stated at the top of each documents). The system_prune.md didn't have this error.
Signed-off-by: Mateusz Major <apkd@users.noreply.github.com >
Upstream-commit: 8b07518458
Component: cli
2018-01-02 19:40:23 +01:00
Sebastiaan van Stijn
bcb9583e82
Merge pull request #773 from thaJeztah/add-authors
...
Add AUTHORS file and script
Upstream-commit: ae4af7ec32
Component: cli
2018-01-02 18:07:06 +01:00
Sebastiaan van Stijn
f8a7c9aa17
Add AUTHORS file and script
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 02e7b18fde
Component: cli
2018-01-02 17:00:22 +01:00
Vincent Demeester
7cbef79c0e
Merge pull request #772 from muicoder/patch-1
...
Fix bash completion for "docker swarm"
Upstream-commit: b0efaaeb8b
Component: cli
2018-01-02 15:14:58 +01:00
Vincent Demeester
5965f4a425
Merge pull request #768 from thaJeztah/warn-unsupported-pid
...
Add "pid" to unsupported options list
Upstream-commit: 4a66821309
Component: cli
2018-01-02 15:14:08 +01:00
muicoder
ae19592ca8
Fix bash completion for "docker swarm"
...
Signed-off-by: muicoder <muicoder@gmail.com >
Upstream-commit: e2f73bb4b7
Component: cli
2018-01-01 12:58:16 +08:00
Silvin Lubecki
cb8fda044c
Activate kubernetes only when experimental cli is enabled
...
* Refactor tests on version and kubernetes switch
* Fix rebase errors
* Refactor for gocyclo linter
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: ad409767bf
Component: cli
2017-12-28 14:40:10 +01:00
Vincent Demeester
effda473ed
Set a global orchestrator flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5d375b348a
Component: cli
2017-12-28 14:40:10 +01:00
Vincent Demeester
d7b5fca8a7
Update golang.org/x/net to not panic
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 12c0825a4c
Component: cli
2017-12-28 14:40:09 +01:00
Sebastiaan van Stijn
d1cf6ac921
Add "pid" to unsupported options list
...
Services do not support custom "pid"-modes (e.g. `--pid=host`), but this
option was ignored silently when deploying a stack.
This patch adds `pid` to the list of unsupported options so that a warning
is printed;
With this patch applied:
$ docker stack deploy -c docker-compose.yml foobar
Ignoring unsupported options: pid
Creating network foobar_default
Creating service foobar_test
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 70a29b492d
Component: cli
2017-12-27 12:45:42 +01:00
Sebastiaan van Stijn
84f5ef8c85
Merge pull request #765 from thaJeztah/remove-incorrect-link
...
Remove reference to non-existing "stack config" command
Upstream-commit: a5fe375289
Component: cli
2017-12-26 18:16:37 +01:00
Sebastiaan van Stijn
40a74c51c6
Remove reference to non-existing "stack config" command
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 424fe2bb2e
Component: cli
2017-12-26 16:47:45 +01:00
Vincent Demeester
dcfd719f61
Error out on orchestrator command that don't support k8s yet
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1a2244e384
Component: cli
2017-12-26 11:46:59 +01:00
Silvin Lubecki
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
Component: cli
2017-12-26 11:46:59 +01:00
Vincent Demeester
1d466a29ee
Update vendoring
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61713c42a4
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
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
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
b5273bceed
Update warning
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f5073f81d2
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
507de4363e
add kubernetes/ README
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0b5883f953
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
1e23b82bb7
Take @nass review into account
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b5170bde03
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
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
Component: cli
2017-12-26 11:45:56 +01:00
Vincent Demeester
cbbf94a252
Move cli/command/orchestrator to cli/command
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0508c09494
Component: cli
2017-12-26 11:25:22 +01:00
Vincent Demeester
1ebc428804
Move /cli/command/stack/kubernetes/api to /kubernetes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f960d2d5f3
Component: cli
2017-12-26 11:22:32 +01:00
Vincent Demeester
4dba81f210
Fix some build failures
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1ff277ad8f
Component: cli
2017-12-26 11:22:32 +01:00
Vincent Demeester
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
Component: cli
2017-12-26 11:22:32 +01:00
Sebastiaan van Stijn
2ac4f6cd3a
Merge pull request #758 from vdemeester/experimental-cli
...
Add support for experimental Cli configuration
Upstream-commit: 70db7cc0fc
Component: cli
2017-12-22 14:56:40 +01:00
Vincent Demeester
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
Component: cli
2017-12-22 14:48:47 +01:00
Sebastiaan van Stijn
618f1e2388
Merge pull request #761 from sourabhtk37/patch-1
...
Corrected descriptions for MAC_ADMIN and MAC_OVERRIDE
Upstream-commit: ebb8927a2a
Component: cli
2017-12-21 11:43:21 +01:00
T K Sourabh
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
Component: cli
2017-12-21 16:06:32 +05:30
Sebastiaan van Stijn
87487ae8dd
Merge pull request #759 from mistyhacks/link-to-attack-surface
...
Fix typo in link
Upstream-commit: 2f3b13742f
Component: cli
2017-12-21 08:33:16 +01:00
Misty Stanley-Jones
1f700eda21
Fix typo in link
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 946cb0d4fd
Component: cli
2017-12-20 15:35:22 -08:00
Vincent Demeester
04606e240e
Merge pull request #757 from pszczekutowicz/master
...
Return errors from client in stack deploy configs
Upstream-commit: 2b8eb23b8c
Component: cli
2017-12-19 11:05:49 +01:00
Paweł Szczekutowicz
3e7449957b
Return errors from client in stack deploy configs
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com >
Upstream-commit: a30dd1b6f3
Component: cli
2017-12-18 21:34:04 +01:00
Daniel Nephin
a67c7bc0ee
Merge pull request #713 from albers/completion-512
...
Fix #512 Bash autocompletion works incorrect with inspect
Upstream-commit: 718a245b6e
Component: cli
2017-12-15 16:33:41 -05:00
Sebastiaan van Stijn
5e5a802f6b
Merge pull request #753 from thaJeztah/image-shortid
...
Updated deprecation status for "repository:shortid"
Upstream-commit: 69b11daa77
Component: cli
2017-12-15 01:35:11 -08:00
Sebastiaan van Stijn
ba6f88e84d
Merge pull request #749 from albers/completion--generic-resource
...
Add support for generic resources to bash completion
Upstream-commit: 8684b99923
Component: cli
2017-12-15 01:08:42 -08:00
Harald Albers
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
Component: cli
2017-12-15 08:56:14 +01:00