Arash Deshmeh
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
Silvin
4681fad5b4
Merge pull request #1139 from thaJeztah/add_orchestrator_warning
...
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
Upstream-commit: cc9495ac89
Component: cli
2018-06-23 14:33:28 +02:00
Silvin Lubecki
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
Sebastiaan van Stijn
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
Andrew Hsu
4ba3dc6e89
Merge pull request #1137 from silvin-lubecki/stack-orchestrator
...
Fix broken swarm commands with Kubernetes defined as orchestrator
Upstream-commit: 151990de62
Component: cli
2018-06-22 13:56:42 -07:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Silvin Lubecki
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
Sebastiaan van Stijn
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
Silvin
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
Sebastiaan van Stijn
453dd51bfc
Merge pull request #1123 from vdemeester/export-save-push
...
Export Push and Save
Upstream-commit: 449f0c067d
Component: cli
2018-06-14 07:37:59 -07:00
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Vincent Demeester
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
Andrew Hsu
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tonis Tiigi
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Sebastiaan van Stijn
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
Silvin
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
Tibor Vass
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
Tibor Vass
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
Tibor Vass
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
Tonis Tiigi
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
Tonis Tiigi
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
Tonis Tiigi
f1e0dd5b11
build: basic buildkit progress support
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0f97642915
Component: cli
2018-06-09 20:51:34 +00:00
Tonis Tiigi
a173c54ac8
build: add experimental buildkit base
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 656fe85c74
Component: cli
2018-06-09 20:51:30 +00:00
Nassim 'Nass' Eddequiouaq
8026c92fb1
Fix removeSingleSigner description
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 92c39dd0ab
Component: cli
2018-06-09 08:14:34 -07:00
Sebastiaan van Stijn
3c1e80ab62
Merge pull request #1116 from vdemeester/vendor-bump-moby
...
Bump moby version (and its dependencies)
Upstream-commit: 75c1bb1f33
Component: cli
2018-06-08 21:35:58 -07:00
Vincent Demeester
e92ec69f61
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2c4de4fb5e
Component: cli
2018-06-08 18:24:26 +02:00
Vincent Demeester
a7c8326a15
Replace gotestyourself by gotest.tools
...
github.com/gotestyourself/gotestyourself moved to gotest.tools with
version 2.0.0. Moving to that one, bumping it to v2.1.0.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dd9478a1f7
Component: cli
2018-06-08 18:23:38 +02:00
Nassim 'Nass' Eddequiouaq
3833ae0f0f
Move the successful removal print
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 2b3361cc1a
Component: cli
2018-06-08 09:21:36 -07:00
Vincent Demeester
d697e2a9fb
Bump mergo to v0.3.5
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 48ed659bc6
Component: cli
2018-06-08 17:15:12 +02:00
Vincent Demeester
5522fc00fc
Merge pull request #1119 from silvin-lubecki/fix-help-docker-client-initialization
...
Check errors when initializing the docker client in the help command
Upstream-commit: aac3124794
Component: cli
2018-06-08 17:05:21 +02:00
Silvin Lubecki
17705eb1b4
Fix #1113 "Segfault on --help with --tlsverify if no ca certificate is present"
...
Errors were not checked while initializing the docker client in the help command
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: f4b0780e20
Component: cli
2018-06-08 16:14:48 +02:00
Vincent Demeester
bfd82b2547
Bump moby version (and its dependencies)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b1065767cd
Component: cli
2018-06-08 11:26:10 +02:00
Silvin
709a15352d
Merge pull request #1115 from vdemeester/o-rly
...
Mark @thajeztah as a MAINTAINER…
Upstream-commit: 001c8f2f7f
Component: cli
2018-06-07 20:55:40 +02:00