Commit Graph

5208 Commits

Author SHA1 Message Date
74cbabea8f Merge pull request #1158 from albers/completion-dockerd--default-address-pool
Add bash completion for `dockerd --default-address-pool`
Upstream-commit: 3991b2fae3
Component: cli
2018-06-29 11:48:43 +02:00
312f1fe0aa Add bash completion for exec_die event
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8443982188
Component: cli
2018-06-29 11:20:23 +02:00
ee38cae4b8 Add bash completion for dockerd --default-address-pool
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e6d9dfe85
Component: cli
2018-06-29 11:11:24 +02:00
644d6fd60f Bump version to 18.07.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f1fa1f3f15
Component: cli
2018-06-28 15:44:15 +02:00
4efabde589 Merge pull request #1151 from vdemeester/update-docker-credential-helper-pass
Update docker-credential-helpers dependency
Upstream-commit: 293553944d
Component: cli
2018-06-28 14:57:05 +02:00
539051208f Update docker-credential-helpers dependency
This is mainly for the `pass` helper ; `pass` shouldn't be called
every docker command anymore ;).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d9741fc96b
Component: cli
2018-06-28 14:44:53 +02:00
efa9f9914b added unit tests covering content trust for plugin install command
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: bc9b42ea9b
Component: cli
2018-06-27 22:16:19 -04:00
d11d5a93ae Merge pull request #1128 from vdemeester/interpolation-options
Add options to the compose loader
Upstream-commit: 204ab4ca74
Component: cli
2018-06-26 15:05:54 +02:00
1821b4879d Refactor stack command/package
- Handle `bundlefile` directly in the `top-level`
  command. `bundlefile` is still experimental and will be deprecated
  in future version — this should make be easier to remove it.
- Validate the `stack` name in all cases (i.e. whatever the
  orchestrator is used)
- Load the composefile ahead of choosing the orchestrator. This
  removes some slight duplication.
- Makes `RunDeploy` easier to use from outside packages (like
  `docker/app`) with a preloaded configuration.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0f9d24f78d
Component: cli
2018-06-26 14:07:26 +02:00
e9bc5ab185 Add options to the compose loader
- Add the possibility to skip interpolation
- Add the possibility to skip schema validation
- Allow customizing the substitution function, to add special cases.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9fdd14f399
Component: cli
2018-06-25 17:15:26 +02:00
fad2548681 Merge pull request #1138 from seemethere/env_experimental
Add env variable option for experimental
Upstream-commit: 61e53fc88a
Component: cli
2018-06-25 14:47:16 +02:00
bd5f8ff9d8 Refactor tests
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 38056740d6
Component: cli
2018-06-25 11:13:32 +02:00
ee21c8c224 Add init support in 3.7 schema
> Run an init inside the container that forwards signals and reaps
  processes

This is supported on `run` and now on Swarm services too, so it's also
possible to have in on a composefile :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cc26da94ed
Component: cli
2018-06-25 11:13:32 +02:00
27e77fdcd7 Add an Extras field on the compose config types.
That field is automaticaly populated with any `x-*` field in the yaml.
And marshalling the compose config struct put them back into place.

This make it possible to get those extra fields without re-inventing
the wheel (i.e. reimplementing 80% of the `cli/compose/*` packages.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 80c26f618e
Component: cli
2018-06-25 10:51:56 +02:00
138db9c689 Add env variable option for experimental
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: e3bb62ed51
Component: cli
2018-06-24 21:15:02 +00:00
003f07b295 fixed output leak from TestRunCommandWithContentTrustErrors unit tests
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
Upstream-commit: d469cbdd14
Component: cli
2018-06-23 10:27:27 -04:00
666c87bcf4 Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e8c87f7cb3
Component: cli
2018-06-22 13:58:39 -07:00
a0daba149d Remove duplicated getOrchestrator(), and rename hideFlag()
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e02c28f40a
Component: cli
2018-06-22 13:58:14 -07:00
763b3149b8 Remove shorthand -k option from docker version
The `-k` shorthand was alreaady removed from other
commands, so best to be consistent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f0a8598b8d
Component: cli
2018-06-21 23:33:55 -07:00
61fded22bf Update command usage and documentation
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 0f07b9ffc7
Component: cli
2018-06-21 23:16:27 -07:00
a1104968c6 Remove "Stack Orchestrator" from "docker version"
The output of this information can be confusing,
so removing until we have a better design for this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a63252ba71
Component: cli
2018-06-21 22:02:11 -07:00
4f7a346b35 Scope orchestration selection to stack commands only
* Renaming DOCKER_ORCHESTRATOR to DOCKER_STACK_ORCHESTRATOR
* Renaming config file option "orchestrator" to "stackOrchestrator"
* "--orchestrator" flag is no more global but local to stack command and subcommands
* Cleaning all global orchestrator code
* Replicating Hidden flags in help and Supported flags from root command to stack command

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
Upstream-commit: 71272dd203
Component: cli
2018-06-21 17:12:31 -07:00
389a1f2402 Merge pull request #1112 from n4ss/fix-trust-signer-remove
Fix docker trust signer removal
Upstream-commit: 8de0753869
Component: cli
2018-06-15 08:18:29 -07:00
ff053f79c8 Merge pull request #1124 from vdemeester/using-cli-interface-everywhere-possible
Use command.Cli interface instead of concrete type…
Upstream-commit: 805b34127a
Component: cli
2018-06-14 16:43:15 +02:00
ea955bc056 Use command.Cli interface instead of concrete type…
… wherever it's possible. Should make it even easier to test and use
another implementation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 88068b9dd7
Component: cli
2018-06-14 16:26:47 +02:00
bc1f18ae47 Export Push and Save
As we did for `Pull`, it will be helpful to expose the push and save
implementation.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: e43c7920ea
Component: cli
2018-06-14 15:48:21 +02:00
8be83cb75e Merge pull request #479 from Tim15/init-option
Add --init option to `docker service create`
Upstream-commit: 70db8dee74
Component: cli
2018-06-14 13:58:52 +02:00
ea934f5313 Add --init option to docker service create
Signed-off-by: Timothy Higinbottom <timhigins@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: ff13f03def
Component: cli
2018-06-14 13:50:12 +02:00
004c784b07 Merge pull request #1122 from thaJeztah/bump_golang_1.10.3
Bump Golang to 1.10.3
Upstream-commit: 722d08f076
Component: cli
2018-06-14 08:30:15 +02:00
a3010b79b8 Merge pull request #1111 from tiborvass/experimental-buildkit
Support for experimental BuildKit
Upstream-commit: 2daec78609
Component: cli
2018-06-13 18:21:41 -07:00
d94fa1b676 build: address some review nits
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b3a5c153d5
Component: cli
2018-06-13 22:40:31 +00:00
9bd0104a83 build: change --no-console to --console=[true|false|auto]
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5a103e1844
Component: cli
2018-06-13 21:07:11 +00:00
d2ef5d2bef build: ensure temporary folder is removed in error case
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 00792d1704
Component: cli
2018-06-13 18:32:29 +00:00
b8a5c63caf vendor: update docker/docker to c752b0991e31ba9869ab6a0661af57e9423874fb
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6c60bb4436
Component: cli
2018-06-13 18:32:29 +00:00
93d874bdbf vendor: update buildkit and fsutil
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8945270cba
Component: cli
2018-06-13 18:32:29 +00:00
fe7ea0fc10 build: skip moby.buildkit.trace Aux message to be future proof
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: aef42093b8
Component: cli
2018-06-13 18:32:28 +00:00
a8a3e02093 build: fix lint issues + refactor
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5919e8a30f
Component: cli
2018-06-13 18:32:28 +00:00
61312d5fa4 build: simplify Close logic in WriteTempDockerfile
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 15674d9ee9
Component: cli
2018-06-13 18:32:28 +00:00
bba5c7c5cf build: add experimental --no-console flag to support non-tty human-readable output with buildkit
Unfortunately, this is for now the only way to see the output of RUN commands when using buildkit.
It is equivalent to `DOCKER_BUILDKIT=1 docker build . 2>&1 | cat`

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: ed75f6202b
Component: cli
2018-06-13 18:32:28 +00:00
58b5fdcfda formatter: fix TestDiskUsageContextFormatWrite expected output
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 584d59d8f5
Component: cli
2018-06-13 18:32:28 +00:00
67e3360010 build: setting DOCKER_BUILDKIT environment variable to any non-empty string enables the use of buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: b2b3f9c461
Component: cli
2018-06-13 18:32:28 +00:00
278bdeaf9d build: fix output handling with buildkit (quiet option, redirects)
With this patch the following become true even with buildkit enabled:
1. `docker build -q .` only outputs the created image's sha256 ID.
2. `docker build -q .` outputs as if no `-q` was specified, if error occurred
3. `docker build . &> out` outputs JSON (instead of TTY characters)

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 640cbb8d2f
Component: cli
2018-06-13 18:32:28 +00:00
250764fab8 build: fix -f handling with buildkit
This commit brings a more pedantic change in the following ambiguous case:
cat Dockerfile | docker build -f otherDockerfile -

The legacy builder does not error out and prefers the Dockerfile from stdin
while the buildkit-based one errors out.

Note that this is only in the case where stdin is a Dockerfile (not an archive)

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 82f0e1e5d8
Component: cli
2018-06-13 18:32:28 +00:00
b17401d002 Bump Golang to 1.10.3
go1.10.3 (released 2018/06/05) includes fixes to the go command, and the
crypto/tls, crypto/x509, and strings packages. In particular, it adds minimal
support to the go command for the vgo transition. See the Go 1.10.3 milestone
on our issue tracker for details;
https://github.com/golang/go/issues?q=milestone%3AGo1.10.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1c71c957cb
Component: cli
2018-06-11 11:13:13 -07:00
6467f7f59f Merge pull request #1121 from vdemeester/gotestyourself-with-tools
Update gotestyourself to gotest.tools
Upstream-commit: 4cb3c70f36
Component: cli
2018-06-11 14:49:20 +02:00
1a5dac4574 build: error out if buildkit is on and stdin is used for both dockerfile and context
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 89e102474c
Component: cli
2018-06-09 20:51:34 +00:00
dcc459a896 build: Add support for using dockerfile from stdin with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 5314a8fc06
Component: cli
2018-06-09 20:51:34 +00:00
0565bb3955 build: Add support for using context from stdin with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e0b3921a03
Component: cli
2018-06-09 20:51:34 +00:00
2dccbba621 build: use a separate upload request for early progress
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8cf213bd0c
Component: cli
2018-06-09 20:51:34 +00:00
1d7ec4c7d5 system: add buildcache formatting
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b19294ee42
Component: cli
2018-06-09 20:51:34 +00:00