3863dd030a
Merge component 'engine' from git@github.com:docker/engine master
2018-06-17 17:06:53 +00:00
3ead1493a1
Merge pull request #37295 from Benjamin28/master
...
Updated path to be consistent w/ current Windows build process
Upstream-commit: de0abf4315fd1d737aedc2e9f410c8125ad1a7fc
Component: engine
2018-06-15 18:09:03 -07:00
4ff27dc23c
Merge component 'engine' from git@github.com:docker/engine master
2018-06-16 00:01:02 +00:00
5379f9201a
Merge pull request #37292 from seemethere/runc
...
Fix compilation on 32bit machines
Upstream-commit: 59469c63dfe351eacd29a57e84abf8ee5eeb5948
Component: engine
2018-06-15 16:30:08 -07:00
330d020ac3
Updated path to be consistent w/ current Windows build process
...
Signed-off-by: Benjamin Baker <Benjamin.baker@utexas.edu >
Upstream-commit: 5122aaf26fdbb68e02cd31baf4a172f1210e49b5
Component: engine
2018-06-15 19:02:53 -04:00
4abb04c090
Fix compilation on 32 bit systems
...
* Update runc commit to ad0f525
* Update buildkit to dbf67a6
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: c5ce4cf654b6cd6402957bd7c7570dd4fac1b902
Component: engine
2018-06-15 20:41:03 +00:00
7626935df5
Merge component 'cli' from git@github.com:docker/cli master
2018-06-15 16:41:43 +00: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
45bbf6eb63
Merge component 'engine' from git@github.com:docker/engine master
2018-06-14 17:07:17 +00:00
62a6d5e50f
Merge component 'cli' from git@github.com:docker/cli master
2018-06-14 16:41:40 +00: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
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
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
1c5329a0c5
Merge pull request #37279 from adshmh/refactor-service-create-integration-tests-use-network-create
...
Create service integration tests use network package
Upstream-commit: 3f405c48fff297ae6ddeed58363b904d2d8e94f9
Component: engine
2018-06-14 12:57:48 +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
a21fe6fe56
Merge pull request #37280 from Microsoft/jjh/fixbuildersources
...
Don't fail to start daemon if builder source is not available
Upstream-commit: d17b78bdfeceeedcc6addc470215d11b4f870960
Component: engine
2018-06-13 22:29:08 -07:00
09a8e539ea
Merge component 'engine' from git@github.com:docker/engine master
2018-06-14 01:48:21 +00:00
ffb8cc81e3
Merge component 'cli' from git@github.com:docker/cli master
2018-06-14 01:24:28 +00: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
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
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
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
39057b0c96
Merge component 'engine' from git@github.com:docker/engine master
2018-06-13 17:07:06 +00:00
89a8d08125
Don't fail to start daemon if builder source is not available
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ca3e3fcf7e66554d20acd990a506d6ee5e368ca1
Component: engine
2018-06-13 09:33:19 -07:00
7cdcffc8da
create service integration tests use network package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: ad46a1f5e7e82b882390c2974a52faa06c5b8cb2
Component: engine
2018-06-13 12:10:02 -04:00
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
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
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
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
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
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
ccbd518d6d
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-06-12 17:07:18 +00:00
97861a230a
Merge component 'engine' from git@github.com:docker/engine master
2018-06-12 17:07:10 +00:00
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
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