18c44e0829
Check and return error while creating kubernetes secret and config maps.
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-01-03 15:46:19 +01:00
f1b116179f
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>
2018-01-03 10:23:32 +01:00
ad409767bf
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>
2017-12-28 14:40:10 +01:00
5d375b348a
Set a global orchestrator flag
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-28 14:40:10 +01:00
70a29b492d
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>
2017-12-27 12:45:42 +01:00
1a2244e384
Error out on orchestrator command that don't support k8s yet
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:46:59 +01:00
ba5d0d8ff5
Move e2e test on version command to unit tests
...
* Refactor a little version command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2017-12-26 11:46:59 +01:00
f5073f81d2
Update warning
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
b5170bde03
Take @nass review into account
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:45:56 +01:00
dedd0db51a
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>
2017-12-26 11:45:56 +01:00
0508c09494
Move cli/command/orchestrator to cli/command
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:25:22 +01:00
f960d2d5f3
Move /cli/command/stack/kubernetes/api to /kubernetes
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-12-26 11:22:32 +01:00
8417e49792
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>
2017-12-26 11:22:32 +01:00
84fe1a1b5b
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>
2017-12-22 14:48:47 +01:00
a30dd1b6f3
Return errors from client in stack deploy configs
...
Signed-off-by: Paweł Szczekutowicz <pszczekutowicz@gmail.com>
2017-12-18 21:34:04 +01:00
8471742a8a
Show container wait error
...
If container wait has failed, show an error from the engine
and return an appropriate exit code.
This requires engine changes from https://github.com/moby/moby/pull/34999
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
2017-12-15 14:15:30 -08:00
9da2602f38
Fix external networks
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-11 11:29:49 -05:00
7138d6e301
Sort component details in template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-12-07 02:04:10 +01:00
5f4c5f8bb6
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>
2017-12-07 02:04:10 +01:00
88bbaca294
Add missing additionalProperties marker on mount definitions
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 12:37:38 -08:00
e49f14cf36
Add shm_size property to build configuration in Compose schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 12:34:12 -08:00
86653f4d57
Merge pull request #732 from ndeloof/8917
...
closes #8917 introduce `—workdir` option for docker exec
2017-12-06 10:51:33 -08:00
8dc88ea7b5
Annotate worker option for 1.35 API
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 17:24:01 +01:00
591a1273fd
introduce `—workdir` option for docker exec
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2017-12-06 17:24:01 +01:00
d0b8aa7701
Support network.name in the compose schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-12-06 10:05:24 -05:00
5ed399e588
Add unit tests on config/secret indempotence in stack deploy
...
Related PR : https://github.com/docker/cli/pull/509
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-11-30 09:45:32 +01:00
d921d5cc39
Merge pull request #694 from riyazdf/trust-inspect
...
docker trust inspect
2017-11-29 11:33:53 -08:00
a9428285f0
Use default inspect formatting, remove omitempty, update docs
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:35 -08:00
1eb87cc096
support multiple arguments to trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:34 -08:00
cd38d39d0d
add docker trust inspect command for JSON viewing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-11-29 10:52:34 -08:00
1ff73f867d
Added support of Generic resources in compose file
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 21:52:09 +01:00
20a6ff32ee
Added support for generic resource update
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
51c7cd91cf
Added Generic Resource tests
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
7ddd5f3434
Updated GenericResource CLI
...
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
2017-11-28 18:03:10 +01:00
ec47003ecb
Remove duplication for secrets / configs, combine 3.5 loader tests, remove extraneous error call, regenerate schema correctly
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
2017-11-22 13:41:16 +02:00
1f10b31017
Add tests for secret.name in compose files.
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
2017-11-22 13:18:05 +02:00
4f7f3d2f61
Add secret.name and config.name in compose.
...
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
2017-11-22 13:18:05 +02:00
66661761d5
attach: Use ContainerWait instead of Inspect
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2017-11-17 18:12:46 -08:00
47cf2ea683
Add isolation mode on service update/create and compose files
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-11-17 15:31:13 +01:00
787e30d57a
Preparing for compose schema v3.5
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
2017-11-17 15:30:32 +01:00
801ddee343
Merge pull request #671 from dnephin/remove-secret-config-duplication
...
Remove secret/config duplication in cli/compose
2017-11-15 19:29:39 +01:00
026c6db6f6
Merge pull request #74 from jamiehannaford/until-logging
...
Add new CLI option for --until
2017-11-14 18:49:46 +01:00
0450a2f437
Add docs
...
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
2017-11-14 18:04:10 +01:00
9c9303e113
add test for logs
...
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
2017-11-13 10:57:44 +01:00
f1cc679618
Add unit tests for some convert/service
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-10 16:28:39 -05:00
a68c940f1a
Remove duplication in compose/convert
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-10 15:56:11 -05:00
7bd26ed690
Remove duplication in loader
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-10 15:56:11 -05:00
a570e9b355
sign test: fix imports
...
Signed-off-by: Kyle Spiers <kyle@spiers.me>
2017-11-10 11:34:04 -08:00
6f309316e2
Add new CLI option for --until
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
2017-11-10 12:38:08 +01:00
5735fff6fc
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-11-08 17:50:58 +01:00
ee0615dc97
Merge pull request #575 from eiais/local-flag
...
trust sign: add --local flag
2017-11-07 14:15:53 -05:00
025f51ca93
Merge pull request #670 from dnephin/cleanup-compose-volume-name
...
Only warn on volume.external.name for version 3.4
2017-11-07 14:29:22 +01:00
042575aac9
Merge pull request #474 from jhowardmsft/jjh/apis-for-platform
...
LCOW: CLI changes to add platform flag - pull, run, create and build
2017-11-07 14:26:31 +01:00
21d88629df
Merge pull request #657 from dnephin/add-test-for-container-cp
...
Adding unit tests for container cp
2017-11-07 14:22:22 +01:00
aea9544db5
Only warn on volume.external.name for version 3.4
...
Also remove use of volume.external.name
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-11-06 17:04:36 -05:00
d8b782560e
LCOW: Add `--platform=` CLI flag to pull/create/run/build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
This is the CLI updates for the document discussed in https://github.com/moby/moby/issues/34617
to support Linux Containers on Windows. It adds --platform= as CLI flags to the four
commands listed above. Import still to be completed (needs daemon changes).
2017-10-31 09:50:43 -07:00
a0140b4ddb
Merge pull request #658 from arehman199/fix-a-number-of-typos
...
fix a number of minor typos
2017-10-31 15:07:51 +01:00
c3fe9d85ef
fix a number of minor typos
...
Fix 19 typos, grammatical errors and duplicated words.
These fixes have minimal impact on the code as these are either in the
doc files or in comments inside the code files.
Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com>
2017-10-31 15:21:51 +05:00
6e04da39b8
Merge pull request #654 from dnephin/pr-fix-image-rm
...
Fix behaviour of `rmi -f` with unexpected errors
2017-10-31 10:38:38 +01:00
f5a50650d6
trust sign: add --local flag
...
Signed-off-by: Kyle Spiers <kyle@spiers.me>
2017-10-30 16:06:03 -07:00
b7b62ca26a
Adding unit tests for cp
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-30 18:33:28 -04:00
96b8d15bdd
Merge pull request #651 from thaJeztah/fix-extra-host-sorting
...
Preserve sort-order of extra hosts, and allow duplicate entries
2017-10-30 20:38:10 +01:00
7ca234fe24
Merge pull request #652 from thaJeztah/move-notary
...
Move notary to its new location
2017-10-30 14:05:59 -04:00
65398de1a6
Merge pull request #655 from eiais/extraQuote
...
Remove extra quotes from docker trust sign
2017-10-30 13:53:18 -04:00
a79e742bfc
Merge pull request #648 from thaJeztah/fix-host-add-description
...
Fix flag description for --host-add
2017-10-30 13:52:29 -04:00
291fdcfdbe
Remove extra quotes from docker trust sign
...
Signed-off-by: Kyle Spiers <kyle@spiers.me>
2017-10-30 10:31:21 -07:00
b900676523
Use t.Run() for tests
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-30 13:00:03 -04:00
125302cfa6
docker rm -f exits with 1 if the image was not removed
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2017-10-30 12:50:19 -04:00
6cd58063fa
Move notary to its new location
...
The https://github.com/docker/notary repository has moved to
https://github.com/theupdateframework/notary
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-30 17:21:41 +01:00
0c4fa699eb
Merge pull request #566 from riyazdf/docker-trust-2
...
docker trust: interact with signers and keys
2017-10-30 17:03:58 +01:00
e189a21a25
review feedback: updating for windows, error paths
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:55:59 +01:00
079471ebeb
update to stderr instead of stdout, update tests
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:55:59 +01:00
b4ef2ddb8b
revendor notary for updated import/export packages, update with rebase
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:55:59 +01:00
2d8cc3cd80
refactoring and adding tests for EC key types
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:55:59 +01:00
532d223db4
trust: move signer and key commands down one level
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:53:54 +01:00
4e797eaa04
docs: add docs for new trust subcommands
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:53:54 +01:00
604bc3f22d
trust: key-load and key-generate code
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:53:53 +01:00
dde9f614a7
trust: add signer-add and signer-remove command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-30 16:53:53 +01:00
dbdf8f6468
Preserve sort-order of extra hosts, and allow duplicate entries
...
Extra hosts (`extra_hosts` in compose-file, or `--hosts` in services) adds
custom host/ip mappings to the container's `/etc/hosts`.
The current implementation used a `map[string]string{}` as intermediate
storage, and sorted the results alphabetically when converting to a service-spec.
As a result, duplicate hosts were removed, and order of host/ip mappings was not
preserved (in case the compose-file used a list instead of a map).
According to the **host.conf(5)** man page (http://man7.org/linux/man-pages/man5/host.conf.5.html )
multi Valid values are on and off. If set to on, the resolver
library will return all valid addresses for a host that
appears in the /etc/hosts file, instead of only the first.
This is off by default, as it may cause a substantial
performance loss at sites with large hosts files.
Multiple entries for a host are allowed, and even required for some situations,
for example, to add mappings for IPv4 and IPv6 addreses for a host, as illustrated
by the example hosts file in the **hosts(5)** man page (http://man7.org/linux/man-pages/man5/hosts.5.html ):
# The following lines are desirable for IPv4 capable hosts
127.0.0.1 localhost
# 127.0.1.1 is often used for the FQDN of the machine
127.0.1.1 thishost.mydomain.org thishost
192.168.1.10 foo.mydomain.org foo
192.168.1.13 bar.mydomain.org bar
146.82.138.7 master.debian.org master
209.237.226.90 www.opensource.org
# The following lines are desirable for IPv6 capable hosts
::1 localhost ip6-localhost ip6-loopback
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
This patch changes the intermediate storage format to use a `[]string`, and only
sorts entries if the input format in the compose file is a mapping. If the input
format is a list, the original sort-order is preserved.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-30 01:48:09 +01:00
79b19cba16
Fix flag description for --host-add
...
The `--host-add` flag adds a new `host:ip` mapping. Even though
adding an entry is idempotent (adding the same mapping multiple
times does not update the service's definition), it does not
_update_ an existing mapping with a new IP-address (multiple
IP-addresses can be defined for a host).
This patch removes the "or update" part from the flag's
description.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-28 16:47:53 +02:00
54e1378e04
Merge pull request #636 from dnephin/fix-trust-output-stream
...
Fix stdout and errors in image/trust
2017-10-27 11:31:01 -04:00
e4940cb8d2
Merge pull request #621 from charrywanganthony/displaystringutils
...
Refactor stringutils and fix docker search output form
2017-10-27 11:08:36 +02:00
6aedafd195
Merge pull request #645 from dnephin/use-upstream-spf13-cobra
...
Hide help flag from help output
2017-10-27 11:00:07 +02:00
926b20fcb5
Refactor stringutils and fix docker search output form when the description has CJK character
...
Signed-off-by: Chao Wang <wangchao.fnst@cn.fujitsu.com>
2017-10-27 11:15:10 +08:00
c0d004f7cf
Update gometalinter
...
and enable the new WarnUnmatchedDirective to warn if a nolint is unnecessary.
remove some unnecessary nolint
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-26 12:21:02 -04:00
b68c3d007f
Merge pull request #601 from dnephin/compose-cast-after-interpolate
...
[Compose] Cast values to expected type after interpolating values
2017-10-26 12:20:04 -04:00
f50345a26c
Hide help flag from help output.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-26 12:17:50 -04:00
8e600e10f7
Fix UseLine
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-25 18:22:04 -04:00
4205416c9b
Update code for upstream cobra
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-25 14:49:26 -04:00
5ab3ae7aba
trust: define new commands and helpers
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-24 11:23:35 +02:00
8f86a25029
Fix stdout and errors in image/trust
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-23 13:54:55 -04:00
1401d5daf2
Merge pull request #620 from dnephin/add-nakedret-linter
...
Add nakedret linter
2017-10-13 14:54:00 +02:00
dbd96badb6
Add nakedret linter.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-12 11:48:51 -04:00
e56a58e4ed
Updates for updated moby version
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-10-12 01:02:10 +02:00
e548861481
Refactor runPull to remove second GetImageReferencesAndAuth
...
Fix unit tests to catch the regression.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-10 16:32:27 -04:00
067fff8b03
trust: update references when pulling
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
2017-10-10 11:19:02 -07:00
af8f563922
Fix load order
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-05 12:03:29 -04:00
18ddec447a
Cast interpolated values
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-04 17:36:47 -04:00
0aa7ca943c
Update interface of Interpolate
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-10-04 17:36:43 -04:00
1367fc1114
Merge pull request #593 from thaJeztah/add-create-output
...
Add output for "secrets" and "configs" on stack deploy
2017-10-03 11:06:04 -04:00
Silvin Lubecki
Vincent Demeester
Sebastiaan van Stijn
Paweł Szczekutowicz
Kir Kolyshkin
Daniel Nephin
Brian Goff
Tibor Vass
Joffrey F
Sebastiaan van Stijn
Nicolas De Loof
Riyaz Faizullabhoy
Renaud Gaubert
Ilya Sotkov
Kenfe-Mickael Laventure
Simon Ferquel
Jamie Hannaford
Kyle Spiers
Jamie Hannaford
Daniel Nephin
Vincent Demeester
John Howard
Abdur Rehman
Arash Deshmeh
Ashwini Oruganti
Chao Wang