Commit Graph
35334 Commits
Author SHA1 Message Date
Derek McGowan 775daf1b72 Update overlay2 to use naive diff for changes
The archive changes function is not implemented correctly
to handle opaque directories.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: ac5d363e67e01c769b4d9e20ed76a278434ee4de
Component: engine
2018-06-20 11:07:36 -07:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Benjamin Baker 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
Eli Uriegas 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
Vincent Demeester 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
Tõnis Tiigi 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
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
John Howard 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
Arash Deshmeh 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
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
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
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
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
Tonis Tiigi 90ea116cca vendor: update runc for helper packages
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2092adf3098f4d1b59ced05251a503f930b84805
Component: engine
2018-06-10 10:05:31 -07:00
Tonis Tiigi f05bfde667 integration-cli: fix error message for non-buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b1942bc015f0ec6258c39748032171c09bf562ab
Component: engine
2018-06-10 10:05:31 -07:00
Tonis Tiigi 5f4f0d9ecc builder: correct output buffering order
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ab4cbe2c3f55ed63ef80d2886cb006d082271630
Component: engine
2018-06-10 10:05:31 -07:00
Tonis Tiigi d75f0ca946 builder: more experimental/windows validation
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 577732f655fc95396b8c2b9a45747c5c95760755
Component: engine
2018-06-10 10:05:30 -07:00
Tonis Tiigi d23b97504d api: update godoc
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 6aa76adf59ce90701f9ccbd6f07caf97228a9f50
Component: engine
2018-06-10 10:05:30 -07:00
Tonis Tiigi 99ee72157e builder: notify output buffering on body close
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1a6262e9efbf2062ade0ad01717f041e6cdfd6fa
Component: engine
2018-06-10 10:05:30 -07:00
Tonis Tiigi 8a84262fd3 builder: fix cancellation context issue
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2567dd9afc070428082aa1bec14ee037337dd5c4
Component: engine
2018-06-10 10:05:30 -07:00
Tonis Tiigi b29ae02ee8 builder: move tagging to exporter
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4cdb6853dcf7105bc355370dac7246d9061e23ee
Component: engine
2018-06-10 10:05:30 -07:00
Tonis Tiigi e7c54d5a63 builder: lint fixes
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 157b0b30dbf2f5af5c5b121bee60c1951af71fb5
Component: engine
2018-06-10 10:05:29 -07:00
Tonis Tiigi e010ecad6a integration-cli: fix health test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 1f09adbe163f008e36dffa45c8f4b43605d7426e
Component: engine
2018-06-10 10:05:29 -07:00
Tonis Tiigi f872f0f30d builder: support for images without layers
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9328f0479b810c76fd5944bf9c856cea1af0c498
Component: engine
2018-06-10 10:05:29 -07:00
Tonis Tiigi 629c647dcf builder: enable gateway through syntax directive
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 72d10ced7dfd013be91347e92723bbbf62539765
Component: engine
2018-06-10 10:05:29 -07:00
Tonis Tiigi 1a41f07112 builder: add support for separate upload-request
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: a25846a67527b2a8de5159608979fc7ff9d70bdf
Component: engine
2018-06-10 10:05:29 -07:00
Tonis Tiigi cd6ea182f9 builder: protect early progress writes
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f3ef8c93d617bdcf250c7b682861c590e7fce411
Component: engine
2018-06-10 10:05:29 -07:00
Tibor Vass b617d4ac86 builder: have TestBuildDockerignoringBadExclusion pass with buildkit
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9cc49b4ab91d1083932b952dec7475c46732b5b5
Component: engine
2018-06-10 10:05:28 -07:00
Tibor Vass 6f67597200 builder: Add TODOBuildkit test requirement, specifically for TestBuildCancellationKillsSleep
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 60a911dfcab2304825e4e8f53999866cfc42d4d8
Component: engine
2018-06-10 10:05:28 -07:00
Tibor Vass af99f154e1 builder: pass DOCKER_BUILDKIT to enable buildkit in tests
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f6e58ca3c8ed880eb6459fbf38e0014f18c9322c
Component: engine
2018-06-10 10:05:28 -07:00
Tibor Vass f50adc2424 builder: fix compiling with buildkit on windows and integration tests
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 3a1da5c534bb71149036eb67792a4eb4f6474144
Component: engine
2018-06-10 10:05:28 -07:00
Tonis Tiigi a9e10d0f4d builder: add support for building from tarball
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 92395261b05610ca0a8ae799220ce29f8ee00fac
Component: engine
2018-06-10 10:05:28 -07:00
Tonis Tiigi acec416240 builder: patch incomplete download handling
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 8900e3c758457785b121368ce832946634b9da00
Component: engine
2018-06-10 10:05:28 -07:00
Tonis Tiigi 11b7f9664a builder: fixes after rebase
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: ed651e796c6fd91d533eadaacfb57c36702edd39
Component: engine
2018-06-10 10:05:28 -07:00
Tonis Tiigi 3a980ed674 builder: expand prune to buildkit
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 760ecf958b741beb1c645a96e69065af9ebcad79
Component: engine
2018-06-10 10:05:27 -07:00
Tonis Tiigi 4cc215fd04 builder: add usage to snapshotter adapter
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: f0a9e54d200e317eb12ccbe9fee1d0c3a49366f5
Component: engine
2018-06-10 10:05:27 -07:00
Tonis Tiigi 33e5fdd844 builder: export build cache records
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: b225258496f3ec8b6906b3fc6a3a2c76e50502d9
Component: engine
2018-06-10 10:05:27 -07:00