Commit Graph

1225 Commits

Author SHA1 Message Date
422d545b21 Add support for IPv6 addresses in --dns parameters.
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
Upstream-commit: e56ff6bda9
Component: cli
2017-05-15 11:57:12 +02:00
89b67db447 Relax dns search to accept empty domain
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 9fdc86ac55
Component: cli
2017-05-15 11:57:12 +02:00
69a62f5946 env-file: variable behavior
trim the front of variables. Error if there are other spaces present.
Leave the value alone.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 7297bfab30
Component: cli
2017-05-15 11:57:12 +02:00
3fc9871b30 --env-file: simple line-delimited
match dock functionality, and not try to achieve shell-sourcing compatibility

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 176347382a
Component: cli
2017-05-15 11:57:11 +02:00
f2632ce254 variable declaration cleanup
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 5684997e54
Component: cli
2017-05-15 11:57:11 +02:00
261c179e16 configurable dns search domains
Add a --dns-search parameter and a DnsSearch
configuration field for specifying dns search
domains.

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: bdc62769d3
Component: cli
2017-05-15 11:57:11 +02:00
de7386fb67 move opts out of pkg because it's related to docker
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c6c287cddc
Component: cli
2017-05-15 11:57:11 +02:00
38f0a8a08c Merge pull request #44 from cyli/root-ca-info-in-cli
Swarm cluster and node TLS info in CLI
Upstream-commit: 35c8732dc9
Component: cli
2017-05-12 17:19:23 -07:00
01a11eea42 Merge pull request #45 from aaronlehmann/configs
Add support for configs
Upstream-commit: 05267be05b
Component: cli
2017-05-12 14:03:53 -04:00
18f96c6ddf Merge pull request #70 from docker/compose-template-substitute-error-signature
Return an error instead of an `*InvalidTemplateError`
Upstream-commit: bb1a403080
Component: cli
2017-05-12 16:51:37 +02:00
41f722d69f Add support for configs
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: db5620026d
Component: cli
2017-05-11 13:42:49 -07:00
d92a25ada7 Vendor docker/docker
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 15b5dda768
Component: cli
2017-05-11 13:42:46 -07:00
48a9b5ccb4 Merge pull request #73 from vdemeester/stack-deploy-support-readonly
Add support for `read_only` services in stack deploy
Upstream-commit: c0cbb6580a
Component: cli
2017-05-11 13:53:45 -04:00
e847c7a1a6 Return an error instead of an *InvalidTemplateError
This mess things up using the `Substitute` method from
outside (i.e. the error is nil but not nil kinda)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3cac3ec9e0
Component: cli
2017-05-11 17:35:06 +02:00
d879a925c4 Add support for read_only services in stack deploy
The `read_only` key in a composefile is not taken into account right
now. Now that services support `--read-only`, so should `stack deploy`

Ref: moby/moby#32994

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0ab760a136
Component: cli
2017-05-11 17:32:52 +02:00
59d08ee4b4 Fix typo in docker.Makefile
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 076976791b
Component: cli
2017-05-11 02:02:13 -07:00
c2c82448c6 Merge pull request #32 from ColinHebert/label_3.3
Move "labels" to compose 3.3 format
Upstream-commit: 0791b27e2b
Component: cli
2017-05-10 22:11:42 -04:00
7844cb9f87 Propagate the swarm cluster and node TLS info provided by the REST API
responses to the CLI. In `node ls`, display only whether the nodes' TLS
info matches the cluster's TLS info, or whether the node needs cert rotation.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: b75858eb09
Component: cli
2017-05-10 17:49:25 -07:00
bf9b362347 Update docker dependency
We need the `pkg/term` dep from docker with OPOST added to the MakeRaw
call in order for the new runc 1.0 integration to work properly.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 56ea98f5ad
Component: cli
2017-05-10 16:07:07 -07:00
8e24a71ed1 Move "labels" to compose 3.3 format
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: 131fe7dfb2
Component: cli
2017-05-11 08:30:48 +10:00
1ae912ce6f Merge pull request #50 from aaronlehmann/secret-targets
Support Custom Secret Targets
Upstream-commit: 0f6f1eafe3
Component: cli
2017-05-10 17:04:20 -04:00
7b4cbe9700 Support Custom Secret Targets
CLI counterpart to https://github.com/moby/moby/pull/32571. Just
involves vendoring github.com/docker/docker/opts.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 978aa7ede0
Component: cli
2017-05-10 13:59:33 -07:00
c85c900b60 cli/command/system: remove ioutils dependency
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9a892f1bbc
Component: cli
2017-05-10 13:38:06 -07:00
91afc881f6 Merge pull request #56 from dnephin/add-compose-bindata-check
Add CI validation for compose bindata
Upstream-commit: bcc46e75ab
Component: cli
2017-05-10 15:49:06 -04:00
e4ab7cd772 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 85504b4f98
Component: cli
2017-05-10 11:40:19 -07:00
239a95a29d Merge pull request #55 from mlaventure/generate-proper-version
Display proper version information
Upstream-commit: ed5762cb9f
Component: cli
2017-05-10 09:34:22 +02:00
8f6076ca93 Move back to upstream go-winio which includes the
needed fixes, as well as the support for go1.8.x

Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 9c32a9d1b7
Component: cli
2017-05-09 16:01:55 -07:00
db689040ae update makefiles: add “vendor” target in docker.Makefile…
… so that contributors don’t need “vndr” on their laptop

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: c1f0bee31c
Component: cli
2017-05-09 14:29:14 -07:00
bfb4425b6f Display proper version information
- The cli version defaults to "unknown-version" unless set via the VERSION env var
- The commit version can be overridden via GITCOMMIT env var
- The build time can be overridden via BUILDTIME env var

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: cf51bde7d9
Component: cli
2017-05-09 14:22:51 -07:00
4ea068a247 Add check for compose bindata.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ef1d58dd87
Component: cli
2017-05-09 15:42:22 -04:00
49eef07b9e Add github templates and initial poule configuration
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1a549c13d3
Component: cli
2017-05-09 16:57:46 +02:00
148130f314 client: check tty before creating exec job
This is necessary in order to avoid execId leaks in the case where a
`docker exec -it` is run without a terminal available for the client.
You can reproduce this issue by running the following command many
times.

  % nohup docker exec -it some_container true

The container `some_container` will have execIDs that will never
normally be cleaned up (because the client died before they were
started).

In addition, this patch adds a docker-inspect step to ensure that we
give "container does not exist" errors consistently.

Signed-off-by: Valentin Rothberg <vrothberg@suse.com>
Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: ee7a956c54
Component: cli
2017-05-09 21:07:40 +10:00
5361203188 Merge pull request #35 from AliyunContainerService/master
Support placement preferences in stack deployment
Upstream-commit: 3d58c3feac
Component: cli
2017-05-09 09:40:04 +02:00
584cb63807 Merge pull request #41 from seemethere/fix_dev_null_device
Fix device for vendor target
Upstream-commit: 2daa598cce
Component: cli
2017-05-09 09:13:21 +02:00
1ae2b9f4e2 Support placement preferences in stack deployment
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
Upstream-commit: b3459936db
Component: cli
2017-05-09 07:00:45 +08:00
0285b89d9b Fix vendor.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aa07c40069
Component: cli
2017-05-08 16:15:54 -04:00
697719d81a Run steps in parallel.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4aa65d9833
Component: cli
2017-05-08 15:57:56 -04:00
5a1580a2fc Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c31d25653f
Component: cli
2017-05-08 15:57:56 -04:00
edf78faba7 Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 37ccc00d0e
Component: cli
2017-05-08 15:57:50 -04:00
8e8e43c61a Merge pull request #28 from dmcgowan/remove-trust-key
Remove unused trust key
Upstream-commit: d9fde418c0
Component: cli
2017-05-08 15:16:24 -04:00
f0517dfa96 Remove unused trust key
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 515d0fd842
Component: cli
2017-05-08 11:49:40 -07:00
18fe518a33 Makefile: on clean, delete files in the build folder, but not the folder
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 17311d3d1a
Component: cli
2017-05-08 11:24:40 -07:00
13041f215c Fix device for vendor target
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2792fbce0f
Component: cli
2017-05-08 10:56:21 -07:00
2ff5f1eac9 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 295140edf2
Component: cli
2017-05-08 10:51:30 -07:00
82b8acb640 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 57230a7212
Component: cli
2017-05-08 10:33:56 -07:00
7b959e8107 update circle.yml
- update from docker:17.04 to docker:17.05
- install git and ssh to suppress CircleCI warning

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: f35682a2f0
Component: cli
2017-05-08 10:25:30 -07:00
d20f087fd4 Add docker build --iidfile=FILE
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:

    image.id: Dockerfile
    	docker build --iidfile=image.id .

    do-some-more-stuff: image.id
    	do-stuff-with <image.id

Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.

In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product.  Having all of the intermediate images might be
interesting in some cases.

In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.

There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.

Added some tests to integration cli tests.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: c3648a9c94
Component: cli
2017-05-05 12:12:36 -07:00
147da8e072 update vendor.conf
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b141fa3799
Component: cli
2017-05-03 19:27:10 -07:00
9ce2cd0d41 Fix expected output in test due to linter-induced change on error string
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 03a36f9d50
Component: cli
2017-05-03 19:26:45 -07:00
f28f6fde81 Refacator pkg/streamformatter
StreamFormatter suffered was two distinct structs mixed into a single struct
without any overlap.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 779012af69
Component: cli
2017-05-03 18:49:14 -07:00