Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,113 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

540 Commits

Author SHA1 Message Date
Vincent Demeester 570ee9cb54
Share the compose loading code between swarm and k8s stack deploy 
To ensure we are loading the composefile the same wether we are pointing
to swarm or kubernetes, we need to share the loading code between both.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-02-14 14:07:48 +01:00
Daniel Nephin b127b8d927 Replace go-bindata with esc 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-12 14:23:19 -05:00
Ivan Markin 57c51c8af3 Fix compilation of defaultCredentialStore() on unsupported platforms 
Signed-off-by: Ivan Markin <sw@nogoegst.net>
 2018-02-10 15:30:32 +00:00
Jake Sanders e1b607a351 defaultIndexserver -> defaultIndexServer 
Signed-off-by: Jake Sanders <jsand@google.com>
 2018-02-09 13:48:01 -08:00
Sungwon Han 34504d0a1e Clarify description of volume prune command 
volume prune command removes only local volumes
not used by at least one container.

Signed-off-by: Sungwon Han <sungwon.han@navercorp.com>
 2018-02-08 15:33:07 +09:00
Sebastiaan van Stijn b5df4f69db
Merge pull request #863 from WTFKr0/tls-env-var 
Add DOCKER_TLS environment variable for --tls option
 2018-02-06 10:24:38 -08:00
Sebastiaan van Stijn 25e969c854
Merge pull request #569 from vdemeester/compose-multiple-version-mergo 
Add support for multiple composefile when deploying
 2018-02-06 00:41:43 -08:00
WTFKr0 42fa3ef7d8 Add DOCKER_TLS environment variable 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2018-02-06 09:27:05 +01:00
Jake Sanders 1d0a37c460 Use Get rather than GetAll to retrieve credentials from credential helpers. 
Signed-off-by: Jake Sanders <jsand@google.com>
 2018-02-05 20:31:46 -08:00
Sebastiaan van Stijn 9de1b162fa
Merge pull request #838 from vdemeester/fix-label-file-behavior 
Fix `--label-file` weird behavior
 2018-01-29 17:32:21 -08:00
Vincent Demeester 1872bd802c
Add support for multiple composefile when deploying 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-01-29 17:27:25 -08:00
Vincent Demeester 2b17f4c8a8
Fix `--label-file` weird behavior 
`--label-file` has the exact same behavior as `--env-file`, meaning any
placeholder (i.e. a simple key, no `=` sign, no value), it will get the
value from the environment variable.

For `--label-file` it should just add an empty label.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-01-29 11:08:54 -08:00
Daniel Nephin a46fa0759d
Merge pull request #804 from thaJeztah/more-annotations 
Annotate "stack" commands to be "swarm" and "kubernetes"
 2018-01-26 15:12:09 -05:00
Silvin Lubecki 14fcadffb1 Using Flags instead of PersistentFlags, as Kubernetes flags seem not to be defined in the "persistent space". 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
 2018-01-24 09:17:08 -08:00
Ethan Haynes e76d8c9eae added check for empty source in bind mount 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>

fixed error by removing punctuation

Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>

removed period

Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>

backtick string to escape double quotes in error messages

Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>

simplified test for bind no source error message

Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-22 18:33:58 -06:00
Sebastiaan van Stijn 93c36eb228
Annotate "stack" commands to be "swarm" and "kubernetes" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-22 15:44:47 -08:00
Vincent Demeester fbb9de2cfc
Merge pull request #780 from thaJeztah/fix-network-add 
Fix --network-add adding duplicate networks
 2018-01-22 14:45:58 -08:00
Sebastiaan van Stijn 44a1168ae5
Merge pull request #696 from mlaventure/attach-use-containerwait 
attach: Use ContainerWait instead of Inspect
 2018-01-20 23:55:16 +01:00
Vincent Demeester 2d29732f40
Mark docker-manifest command as experimental (cli) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-01-18 13:19:33 -08:00
Vincent Demeester 11dfa23a5d
Merge pull request #138 from clnperez/manifest-cmd 
Add manifest command
 2018-01-18 22:15:49 +01:00
Daniel Nephin fab4762941
Merge pull request #581 from thaJeztah/better-port-range-printing 
Improve presentation of published port ranges
 2018-01-16 17:16:45 -05:00
Sebastiaan van Stijn 14c62f655a
Merge pull request #808 from ethan-haynes/698-tmpfs-mode-compose 
added support for tmpfs-mode in compose file
 2018-01-16 20:59:17 +01:00
Daniel Nephin 1620538c49
Merge pull request #755 from kolyshkin/wait 
Show container wait error
 2018-01-16 14:40:36 -05:00
Kir Kolyshkin 85ddaee5af container.waitExitOrRemoved(): add a test case 
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2018-01-16 10:16:28 -08:00
Ethan Haynes cd69d082ea added support for tmpfs-mode in compose file 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-16 10:52:26 -06:00
Ethan Haynes b15362ce32 adding tmpfs field to the compose 3.6v file spec and updating binary 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-16 10:50:40 -06:00
Ethan Haynes 2b8cc52409 adding config_schema_v3.6.json and updating binary 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-16 10:44:08 -06:00
Akim Demaille f83aa7b705 Remove: add missing eol when --force is passed 
Signed-off-by: Akim Demaille <akim.demaille@docker.com>
 2018-01-16 09:29:53 +01:00
Sebastiaan van Stijn d845b4d36a
golint: remove redundant ifs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-13 13:16:34 +01:00
Sebastiaan van Stijn a812995f98
Remove aliases for orchestrator 
Prefer "strict" values for orchestrator, as it's
easier to add aliases (if we think it's needed) than
to remove them later.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-11 21:16:37 +01:00
Sebastiaan van Stijn e6ebaf55dd
Fix --network-add adding duplicate networks 
When adding a network using `docker service update --network-add`,
the new network was added by _name_.

Existing entries in a service spec are listed by network ID, which
resulted in the CLI not detecting duplicate entries for the same
network.

This patch changes the behavior to always use the network-ID,
so that duplicate entries are correctly caught.

Before this change;

    $ docker network create -d overlay foo
    $ docker service create --name=test --network=foo nginx:alpine
    $ docker service update --network-add foo test
    $ docker service inspect --format '{{ json .Spec.TaskTemplate.Networks}}' test
    [
      {
        "Target": "9ot0ieagg5xv1gxd85m7y33eq"
      },
      {
        "Target": "9ot0ieagg5xv1gxd85m7y33eq"
      }
    ]

After this change:

    $ docker network create -d overlay foo
    $ docker service create --name=test --network=foo nginx:alpine
    $ docker service update --network-add foo test
    service is already attached to network foo

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-01-09 20:42:09 +01:00
Christy Perez db6d87216d manifest tests 
create, annotate, & push

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2018-01-08 11:12:57 -06:00
Christy Perez 02719bdbb5 add manifest command 
Enable inspection (aka "shallow pull") of images' manifest info, and
also the creation of manifest lists (aka "fat manifests").

The workflow for creating a manifest list will be:

`docker manifest create new-list-ref-name image-ref [image-ref...]`
`docker manifest annotate new-list-ref-name image-ref --os linux --arch
arm`
`docker manifest push new-list-ref-name`

The annotate step is optional. Most architectures are fine by default.

There is also a `manifest inspect` command to allow for a "shallow pull"
of an image's manifest: `docker manifest inspect
manifest-or-manifest_list`.

To be more in line with the existing external manifest tool, there is
also a `-v` option for inspect that will show information depending on
what the reference maps to (list or single manifest).

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-01-08 10:43:56 -06:00
Michael Friis 99e3b4cd93 use 'config' over 'configuration file' 
Signed-off-by: Michael Friis <friism@gmail.com>
 2018-01-05 13:19:53 -08:00
Vincent Demeester e708c900f8
Merge pull request #721 from silvin-lubecki/kube 
Add kubernetes support to docker/cli
 2018-01-03 17:20:43 +01:00
Silvin Lubecki 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
Silvin Lubecki 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
Silvin Lubecki 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
Vincent Demeester 5d375b348a Set a global orchestrator flag 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-12-28 14:40:10 +01:00
Sebastiaan van Stijn 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
Vincent Demeester 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
Silvin Lubecki 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
Vincent Demeester f5073f81d2 Update warning 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-12-26 11:45:56 +01:00
Vincent Demeester b5170bde03 Take @nass review into account 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-12-26 11:45:56 +01:00
Vincent Demeester 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
Vincent Demeester 0508c09494 Move cli/command/orchestrator to cli/command 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-12-26 11:25:22 +01:00
Vincent Demeester 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
Vincent Demeester 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
Vincent Demeester 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
Paweł Szczekutowicz 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
Kir Kolyshkin 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
Daniel Nephin 9da2602f38 Fix external networks 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-12-11 11:29:49 -05:00
Brian Goff 7138d6e301 Sort component details in template 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-12-07 02:04:10 +01:00
Tibor Vass 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
Joffrey F 88bbaca294 Add missing additionalProperties marker on mount definitions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 12:37:38 -08:00
Joffrey F 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
Sebastiaan van Stijn 86653f4d57
Merge pull request #732 from ndeloof/8917 
closes #8917 introduce `—workdir` option for docker exec
 2017-12-06 10:51:33 -08:00
Nicolas De Loof 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
Nicolas De Loof 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
Daniel Nephin d0b8aa7701 Support network.name in the compose schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-12-06 10:05:24 -05:00
Vincent Demeester 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
Sebastiaan van Stijn d921d5cc39
Merge pull request #694 from riyazdf/trust-inspect 
docker trust inspect
 2017-11-29 11:33:53 -08:00
Riyaz Faizullabhoy 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
Riyaz Faizullabhoy 1eb87cc096 support multiple arguments to trust inspect 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2017-11-29 10:52:34 -08:00
Riyaz Faizullabhoy 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
Renaud Gaubert 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
Renaud Gaubert 20a6ff32ee Added support for generic resource update 
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
 2017-11-28 18:03:10 +01:00
Renaud Gaubert 51c7cd91cf Added Generic Resource tests 
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
 2017-11-28 18:03:10 +01:00
Renaud Gaubert 7ddd5f3434 Updated GenericResource CLI 
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
 2017-11-28 18:03:10 +01:00
Ilya Sotkov 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
Ilya Sotkov 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
Ilya Sotkov 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
Kenfe-Mickael Laventure 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
Simon Ferquel 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
Simon Ferquel 787e30d57a Preparing for compose schema v3.5 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-11-17 15:30:32 +01:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 026c6db6f6
Merge pull request #74 from jamiehannaford/until-logging 
Add new CLI option for --until
 2017-11-14 18:49:46 +01:00
Jamie Hannaford 0450a2f437 Add docs 
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
 2017-11-14 18:04:10 +01:00
Jamie Hannaford 9c9303e113 add test for logs 
Signed-off-by: Jamie Hannaford <jamie@limetree.org>
 2017-11-13 10:57:44 +01:00
Daniel Nephin f1cc679618 Add unit tests for some convert/service 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-11-10 16:28:39 -05:00
Daniel Nephin a68c940f1a Remove duplication in compose/convert 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-11-10 15:56:11 -05:00
Daniel Nephin 7bd26ed690 Remove duplication in loader 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-11-10 15:56:11 -05:00
Kyle Spiers a570e9b355 sign test: fix imports 
Signed-off-by: Kyle Spiers <kyle@spiers.me>
 2017-11-10 11:34:04 -08:00
Jamie Hannaford 6f309316e2 Add new CLI option for --until 
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
 2017-11-10 12:38:08 +01:00
Sebastiaan van Stijn 5735fff6fc
Bump moby to f4d4f5863156b82ef146b6ff1e845f8dcf019f12 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-11-08 17:50:58 +01:00
Daniel Nephin ee0615dc97
Merge pull request #575 from eiais/local-flag 
trust sign: add --local flag
 2017-11-07 14:15:53 -05:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Vincent Demeester 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
Daniel Nephin 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
John Howard 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
Vincent Demeester 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
Abdur Rehman 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
Vincent Demeester 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
Kyle Spiers f5a50650d6 trust sign: add --local flag 
Signed-off-by: Kyle Spiers <kyle@spiers.me>
 2017-10-30 16:06:03 -07:00
Daniel Nephin b7b62ca26a Adding unit tests for cp 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-10-30 18:33:28 -04:00
Sebastiaan van Stijn 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
Brian Goff 7ca234fe24
Merge pull request #652 from thaJeztah/move-notary 
Move notary to its new location
 2017-10-30 14:05:59 -04:00
Daniel Nephin 65398de1a6
Merge pull request #655 from eiais/extraQuote 
Remove extra quotes from docker trust sign
 2017-10-30 13:53:18 -04:00
Daniel Nephin 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