GordonTheTurtle
62a6d5e50f
Merge component 'cli' from git@github.com:docker/cli master
2018-06-14 16:41:40 +00: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
GordonTheTurtle
09a8e539ea
Merge component 'engine' from git@github.com:docker/engine master
2018-06-14 01:48:21 +00:00
GordonTheTurtle
ffb8cc81e3
Merge component 'cli' from git@github.com:docker/cli master
2018-06-14 01:24:28 +00: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
Sebastiaan van Stijn
a53be8bf33
Merge pull request #37270 from adshmh/refactor-service-network-integration-tests-use-network-create
...
refactored service network integration tests to use the network package
Upstream-commit: d3d58b68c628edd138f3956614bffccfe81814a4
Component: engine
2018-06-13 13:11:31 -07:00
Sebastiaan van Stijn
1eb0321c55
Merge pull request #37276 from yui-knk/fix_anchor
...
Fix link anchors in CONTRIBUTING.md
Upstream-commit: 64b4936ca9e13d6e3c1327bf3145eadc258c556c
Component: engine
2018-06-13 13:09:59 -07: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
GordonTheTurtle
39057b0c96
Merge component 'engine' from git@github.com:docker/engine master
2018-06-13 17:07:06 +00:00
Vincent Demeester
2d48a7f46a
Merge pull request #37243 from vdemeester/gotestyourself-with-tools
...
Update gotestyourself to gotest.tools
Upstream-commit: 692df4699c3dcbe4645e9b90cc40091b1f2519d4
Component: engine
2018-06-13 16:23:26 +02:00
Yuichiro Kaneko
2e5e9bbe35
Fix link anchors in CONTRIBUTING.md
...
This is a follow up of #35168 .
Signed-off-by: Yuichiro Kaneko <spiketeika@gmail.com >
Upstream-commit: 7b3966245de27b753c6acfe0347833811ed9eed8
Component: engine
2018-06-13 21:58:48 +09:00
Vincent Demeester
4cadaa03f8
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 38457285242e57306c5b7ee652c7ccbb9fbd6713
Component: engine
2018-06-13 09:04:30 +02:00
Vincent Demeester
9b920fd3e1
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: c147e9e1a45b1c66bc5773814b53bcd27132557c
Component: engine
2018-06-13 09:04:03 +02:00
Tibor Vass
e027a9c59e
Merge pull request #37151 from tonistiigi/experimental-buildkit
...
Experimental BuildKit support
Upstream-commit: c752b0991e31ba9869ab6a0661af57e9423874fb
Component: engine
2018-06-12 13:31:48 -07:00
Arash Deshmeh
2ba3b58b47
refactored network integration tests under integration/network/service_test.go to use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 694047183a9f72b3b2b45ef09f27dc0776fa3e10
Component: engine
2018-06-12 14:31:01 -04:00
GordonTheTurtle
ccbd518d6d
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-06-12 17:07:18 +00:00
GordonTheTurtle
97861a230a
Merge component 'engine' from git@github.com:docker/engine master
2018-06-12 17:07:10 +00:00
Sebastiaan van Stijn
c917ff2fc9
Merge pull request #37239 from vdemeester/bump-mergo
...
Upgrade imdario/mergo to v0.3.5
Upstream-commit: a9fbbdc8dd8794b20af358382ab780559bca589d
Component: engine
2018-06-11 22:40:59 -07: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
Eli Uriegas
3b5238767d
Merge pull request #114 from thaJeztah/bump_golang_1.10.3
...
Bump Golang to 1.10.3
Upstream-commit: 0e26700e872244086288bd45426b37d5734a9ab7
Component: packaging
2018-06-11 10:56:03 -07:00
Sebastiaan van Stijn
3d7a0f54f5
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: 65fc4f1c0cc81739df97605f1fbf91dbf2e7739f
Component: packaging
2018-06-11 10:35:39 -07:00
GordonTheTurtle
67f1296214
Merge component 'engine' from git@github.com:docker/engine master
2018-06-11 17:06:57 +00:00
GordonTheTurtle
9d7fa4df84
Merge component 'cli' from git@github.com:docker/cli master
2018-06-11 16:41:37 +00:00
Vincent Demeester
36f219fce9
Upgrade imdario/mergo to v0.3.5
...
Mainly to get inline with `docker/cli` version of that dependency
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f929f15dd6e316402394143eeb60ad9ba95a81cb
Component: engine
2018-06-11 15:30:46 +02: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
Vincent Demeester
5dc3589aac
Merge pull request #37252 from thaJeztah/bump-libnetwork
...
bump libnetwork to 19279f0492417475b6bfbd0aa529f73e8f178fb5
Upstream-commit: d812dee47e26ad4db1d53102f0c16af01f70cf2c
Component: engine
2018-06-11 08:23:05 +02:00
Sebastiaan van Stijn
cea0f5a067
Merge pull request #37259 from unclejack/bump_go_to_1.10.3
...
Dockerfile*: bump Go to 1.10.3
Upstream-commit: 27f5ba6d705926fee87c252656e2d3152ac5188b
Component: engine
2018-06-10 17:22:29 -07:00
Sebastiaan van Stijn
3eed41c59d
Merge pull request #37255 from adshmh/refactor-delete-network-integration-tests-use-network-create
...
refactor delete network integration tests to use network package
Upstream-commit: f010dba4901d07b5e1fd0f9227c0996267b3adae
Component: engine
2018-06-10 13:57:54 -07:00
Tonis Tiigi
ed25213177
builder: update ID of trace messages
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 8ccbc2c40a063dbd4251b684ded1573d99ded337
Component: engine
2018-06-10 10:05:32 -07:00
Tonis Tiigi
ea746c1733
builder: updates for newer containerd
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f41af1efd04ae054fea70c8999112b6dfd4dcf72
Component: engine
2018-06-10 10:05:31 -07:00
Tonis Tiigi
d3f78ce983
builder: override history dates from ref metadata
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 0728fb2b6395bd52524a1e5c134a1b37848a9c56
Component: engine
2018-06-10 10:05:31 -07:00
Derek McGowan
bfaba7aa6b
Add support for schema 1 pull
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net >
Upstream-commit: 96c65a3adf95bc2d972123036d6b81ea3432af33
Component: engine
2018-06-10 10:05:31 -07:00