0e83042e54
Import TestBuildIidFileSquash from moby to cli
...
It's a cli only feature so the test belongs to the cli.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-25 11:44:09 +02:00
0f6936d557
Merge pull request #1129 from vdemeester/init-in-composefile
...
Add `init` support in 3.7 schema
2018-06-25 11:18:20 +02:00
38056740d6
Refactor tests
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
2018-06-25 11:13:32 +02:00
cc26da94ed
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>
2018-06-25 11:13:32 +02:00
e529043c51
Merge pull request #1126 from vdemeester/extra-extras
...
Add an `Extras` field on the compose config types.
2018-06-25 10:58:50 +02:00
80c26f618e
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>
2018-06-25 10:51:56 +02:00
1c20e3f601
Merge pull request #1141 from adshmh/fix-output-leak-from-TestRunCommandWithContentTrustErrors
...
fixed output leak from TestRunCommandWithContentTrustErrors
2018-06-24 09:20:56 +02:00
d469cbdd14
fixed output leak from TestRunCommandWithContentTrustErrors unit tests
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com>
2018-06-23 10:27:27 -04:00
cc9495ac89
Merge pull request #1139 from thaJeztah/add_orchestrator_warning
...
Warn if DOCKER_ORCHESTRATOR is still used but not DOCKER_STACK_ORCHESTRATOR
2018-06-23 14:33:28 +02:00
e8c87f7cb3
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>
2018-06-22 13:58:39 -07:00
e02c28f40a
Remove duplicated getOrchestrator(), and rename hideFlag()
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-22 13:58:14 -07:00
151990de62
Merge pull request #1137 from silvin-lubecki/stack-orchestrator
...
Fix broken swarm commands with Kubernetes defined as orchestrator
2018-06-22 13:56:42 -07:00
f0a8598b8d
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>
2018-06-21 23:33:55 -07:00
0f07b9ffc7
Update command usage and documentation
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-06-21 23:16:27 -07:00
a63252ba71
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>
2018-06-21 22:02:11 -07:00
71272dd203
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>
2018-06-21 17:12:31 -07:00
8de0753869
Merge pull request #1112 from n4ss/fix-trust-signer-remove
...
Fix docker trust signer removal
2018-06-15 08:18:29 -07:00
805b34127a
Merge pull request #1124 from vdemeester/using-cli-interface-everywhere-possible
...
Use command.Cli interface instead of concrete type…
2018-06-14 16:43:15 +02:00
449f0c067d
Merge pull request #1123 from vdemeester/export-save-push
...
Export Push and Save
2018-06-14 07:37:59 -07:00
88068b9dd7
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>
2018-06-14 16:26:47 +02:00
e43c7920ea
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>
2018-06-14 15:48:21 +02:00
70db8dee74
Merge pull request #479 from Tim15/init-option
...
Add --init option to `docker service create`
2018-06-14 13:58:52 +02:00
ff13f03def
Add --init option to `docker service create`
...
Signed-off-by: Timothy Higinbottom <timhigins@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-14 13:50:12 +02:00
722d08f076
Merge pull request #1122 from thaJeztah/bump_golang_1.10.3
...
Bump Golang to 1.10.3
2018-06-14 08:30:15 +02:00
2daec78609
Merge pull request #1111 from tiborvass/experimental-buildkit
...
Support for experimental BuildKit
2018-06-13 18:21:41 -07:00
b3a5c153d5
build: address some review nits
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 22:40:31 +00:00
5a103e1844
build: change --no-console to --console=[true|false|auto]
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 21:07:11 +00:00
00792d1704
build: ensure temporary folder is removed in error case
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:29 +00:00
6c60bb4436
vendor: update docker/docker to c752b0991e31ba9869ab6a0661af57e9423874fb
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:29 +00:00
8945270cba
vendor: update buildkit and fsutil
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-13 18:32:29 +00:00
aef42093b8
build: skip moby.buildkit.trace Aux message to be future proof
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:28 +00:00
5919e8a30f
build: fix lint issues + refactor
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:28 +00:00
15674d9ee9
build: simplify Close logic in WriteTempDockerfile
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:28 +00:00
ed75f6202b
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>
2018-06-13 18:32:28 +00:00
584d59d8f5
formatter: fix TestDiskUsageContextFormatWrite expected output
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:28 +00:00
b2b3f9c461
build: setting DOCKER_BUILDKIT environment variable to any non-empty string enables the use of buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-13 18:32:28 +00:00
640cbb8d2f
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>
2018-06-13 18:32:28 +00:00
82f0e1e5d8
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>
2018-06-13 18:32:28 +00:00
1c71c957cb
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>
2018-06-11 11:13:13 -07:00
4cb3c70f36
Merge pull request #1121 from vdemeester/gotestyourself-with-tools
...
Update gotestyourself to gotest.tools
2018-06-11 14:49:20 +02:00
89e102474c
build: error out if buildkit is on and stdin is used for both dockerfile and context
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-09 20:51:34 +00:00
5314a8fc06
build: Add support for using dockerfile from stdin with buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-09 20:51:34 +00:00
e0b3921a03
build: Add support for using context from stdin with buildkit
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2018-06-09 20:51:34 +00:00
8cf213bd0c
build: use a separate upload request for early progress
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-09 20:51:34 +00:00
b19294ee42
system: add buildcache formatting
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-09 20:51:34 +00:00
0f97642915
build: basic buildkit progress support
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-09 20:51:34 +00:00
656fe85c74
build: add experimental buildkit base
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2018-06-09 20:51:30 +00:00
92c39dd0ab
Fix removeSingleSigner description
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com>
2018-06-09 08:14:34 -07:00
75c1bb1f33
Merge pull request #1116 from vdemeester/vendor-bump-moby
...
Bump moby version (and its dependencies)
2018-06-08 21:35:58 -07:00
2c4de4fb5e
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-08 18:24:26 +02:00
Vincent Demeester
Silvin
Silvin Lubecki
Vincent Demeester
Arash Deshmeh
Sebastiaan van Stijn
Andrew Hsu
Sebastiaan van Stijn
Tibor Vass
Tonis Tiigi
Nassim 'Nass' Eddequiouaq