Commit Graph
32472 Commits
Author SHA1 Message Date
Vincent Demeester 434dcf82ed Merge pull request #32939 from jvmatl/master
Improve documentation on the -e flag to the 'run' cli command. 
Upstream-commit: 85a7f4bbc7e3817f7ab0aaff270aad697e86068c
Component: engine
2017-05-09 09:50:21 +02:00
Vincent Demeester d16e6f29c5 Merge pull request #32877 from chchliang/unittest
add testcase with api/errors/errors_test.go
Upstream-commit: 6b3801858c7aec2c2170a9c9a9a8651d071b1549
Component: engine
2017-05-09 09:42:08 +02:00
Vincent Demeester 7c11016102 Merge pull request #33083 from albers/completion-stack-deploy--prune
bash completion for `stack deploy --prune`
Upstream-commit: 040a1d79a2fd2b023f095a705661dfcfbb657f3d
Component: engine
2017-05-09 09:36:12 +02:00
Boaz Shuster 07ecdb31c7 Disable HTML escaping for JSON in formatter
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
Upstream-commit: 5766317e33f088c438eff52124c516f18e764b99
Component: engine
2017-05-09 10:16:10 +03:00
Nishant Totla 9657e321b1 Adding /distribution/{name}/json endpoint to contact registry
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 41b27de41b8b0e034bfe2a3c73b2bc6ff98c7ceb
Component: engine
2017-05-08 16:58:38 -07:00
Nishant Totla fae2fb0e64 Change GetRepository to take Named arguments
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: e842c653a0de4fa7073d2402f4817de308a82bd0
Component: engine
2017-05-08 16:58:38 -07:00
Tibor Vass cf964b3db2 Merge pull request #33059 from nishanttotla/vendor-swarmkit
Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Upstream-commit: 4b846a125b1618e19b389bcdf88b57bef0a05817
Component: engine
2017-05-08 14:27:51 -07:00
Tonis Tiigi ead01af4bc Add builder dev-report for 2017-05-07
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 63c16a443a9d5728dec19ae5de4abb61bdb9441c
Component: engine
2017-05-08 11:36:37 -07:00
Brian Goff 652bcc7bd2 Merge pull request #33092 from tonistiigi/remove-install-binary-client
hack: Remove install-binary-client
Upstream-commit: daa8b262fe44f5e9567477f55e026cca907e9589
Component: engine
2017-05-08 14:32:13 -04:00
Tonis Tiigi d4514d6239 hack: Remove install-binary-client
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 973bce210039085416229c05c97c23feb5db9866
Component: engine
2017-05-08 10:50:31 -07:00
Tonis Tiigi 35368a62c5 builder: Fix releasing implicit mounts
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 29efb93a19fd46e026055892ccd5c5f44743277d
Component: engine
2017-05-08 10:32:20 -07:00
Sebastiaan van Stijn dea94ff28a Merge pull request #33085 from thaJeztah/docs-improve-pipe-description
fix confusing description of stdout/stdin pipe
Upstream-commit: dda41118b0b09b0377bf4957051b8f6dcd89ed14
Component: engine
2017-05-08 18:55:04 +02:00
John Howard 23f95e7a60 Windows: Block read-only
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6f7dc65847c45e85e48bb42387114000d2334844
Component: engine
2017-05-08 09:29:37 -07:00
Kenfe-Mickaël Laventure 53d1a4eb83 Merge pull request #33007 from crosbymichael/containerd-rc5
Update moby to containerd and runc 1.0 final rc
Upstream-commit: 7238cca42c3d024adfa030306ad3e3ec4232baed
Component: engine
2017-05-08 09:23:07 -07:00
Sebastiaan van Stijn a1f703247a fix confusing description of stdout/stdin pipe
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c3dff2359dbea4f6f0f001421ddeae4ef76b931f
Component: engine
2017-05-08 15:33:14 +02:00
Sebastiaan van Stijn 20ec9814c7 Merge pull request #32978 from thaJeztah/fix-network-list-example
Update description and example for network-list endpoint
Upstream-commit: afd7e2d2d5ba506205fcc6501d4479c7e2706f50
Component: engine
2017-05-08 15:14:55 +02:00
Harald Albers 4f3eebb317 bash completion for stack deploy --prune
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8f159358fb91be0bd47cc1fe60f3882ecf92f360
Component: engine
2017-05-08 10:14:15 +02:00
Colin Hebert 205ed67bbf Remove compose
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
Upstream-commit: a1aa69433da83a03d3adf039de4a18d0d73be8e1
Component: engine
2017-05-06 10:57:07 +10:00
Victor Vieux 440d8b67e7 Merge pull request #33006 from dperny/service-logs-fix-hanging-logs-removed-containers-no-wait
Fix an issue with service logs hanging
Upstream-commit: 7ca86796c94c7ae0c62680ac664f97ab5f35ebec
Component: engine
2017-05-05 15:16:13 -07:00
Tibor Vass 0456165ea4 Merge pull request #32694 from tiborvass/cli_removal
Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope
Upstream-commit: 34337db95d8eb85875509e341f452d8b555452b8
Component: engine
2017-05-05 15:03:30 -07:00
Nishant Totla 4356b71651 Vendor swarmkit f420c4b9e1535170fc229db97ee8ac32374020b1
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
Upstream-commit: 1b68641fc8fe0767aba510ec04fdc1dd221e5d0c
Component: engine
2017-05-05 14:18:12 -07:00
Brian Goff d267fa757f Do not remove containers from memory on error
Before this, if `forceRemove` is set the container data will be removed
no matter what, including if there are issues with removing container
on-disk state (rw layer, container root).

In practice this causes a lot of issues with leaked data sitting on
disk that users are not able to clean up themselves.
This is particularly a problem while the `EBUSY` errors on remove are so
prevalent. So for now let's not keep this behavior.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 54dcbab25ea4771da303fa95e0c26f2d39487b49
Component: engine
2017-05-05 17:02:04 -04:00
Michael Crosby ce61a3d4f2 Update moby to runc and oci 1.0 runtime final rc
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 005506d36c1c9308a05592d7596f3d484359c426
Component: engine
2017-05-05 13:45:45 -07:00
Brian Goff 9f15ce38af Merge pull request #29554 from cpuguy83/keep_running_count_of_states
Use counter for tracking container states
Upstream-commit: 669f4ba37ef6eb5419306e6af4f6efdce92501a0
Component: engine
2017-05-05 16:15:22 -04:00
Tibor Vass 400bf9fc6d Prevent ppc64le to build pkg/term without cgo
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 71e9f5c520bd457508994b11938b7a6c577beaaf
Component: engine
2017-05-05 12:14:30 -07:00
Tibor Vass 0424213965 Enforce CGO_ENABLED=0 only for docker-proxy
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e30c2e86e8ec2040fa2d1e1e20d8fcd6decd0ddb
Component: engine
2017-05-05 12:14:30 -07:00
Tibor Vass d0052ddc0d fix expected output in tests
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f47a61c42957c0a98944a0723b3807aa4d07ed8e
Component: engine
2017-05-05 12:14:30 -07:00
Arnaud Porterie (icecrime) a8b3ac7249 Remove cmd/docker and other directories in cli/ in accordance with the new Moby project scope
Starting with this commit, integration tests should no longer rely on
the docker cli, they should be API tests instead. For the existing tests
the scripts will use a frozen version of the docker cli with a
DOCKER_API_VERSION frozen to 1.30, which should ensure that the CI remains
green at all times.

To help contributors develop and test manually with a modified docker
cli, this commit also adds a DOCKER_CLI_PATH environment variable to the
Makefile. This allows to set the path of a custom cli that will be
available inside the development container and used to run the
integration tests.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 32915b1d0a315598edb737785d0357b5a1b8aa11
Component: engine
2017-05-05 12:14:29 -07:00
Per Weijnitz 391556ba38 Correcting test-instruction.
Signed-off-by: Per Weijnitz <per.weijnitz@gmail.com>

Correcting instructions for test suite run.

Signed-off-by: Per Weijnitz <per.weijnitz@gmail.com>
Upstream-commit: 5a076d7589d7a30cc0a1e45eff6674a2c8fa1cb0
Component: engine
2017-05-05 20:33:48 +02:00
Derek McGowan 335fe41792 Use diff ids from image configuration
The diff id resolution currently relies on a stored mapping for
archive digest to diff id. This mapping could be derived from
the image configuration if the image configuration is available.
On linux the image config is pulled in parallel and may not be
available. On windows, however, it is always pulled first and can
be used to supplement the stored mapping for images which may not
have this mapping from being side loaded. This becomes useful when
combined with side loaded foreign layers.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Upstream-commit: 633f9252b8e066ef7a1a738ddc84c3970379844e
Component: engine
2017-05-05 10:56:40 -07:00
Daniel Nephin bab22f4137 Merge pull request #32406 from ijc25/docker-build-iidfile
Add `docker build --iidfile=FILE`
Upstream-commit: d624f9a7b00419179eb0e7e81f2894dde0752873
Component: engine
2017-05-05 13:56:31 -04:00
Sebastiaan van Stijn 7e3625db1c Update description and example for network-list endpoint
As of API 1.28, the network-list endpoint no longer
returns a list of containers attached to each network.

This patch updates the example response, and adds
a note to the description.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fedb3b8884aea996e3a5c4fa7ccda2f931bb545a
Component: engine
2017-05-05 10:36:48 -07:00
Vincent Demeester d776eee39f Merge pull request #32849 from aaronlehmann/vendor-swarmkit-62d58ee
Vendor swarmkit 8f053c2
Upstream-commit: 230bc34837710050e3205956d5afb35c4242b7c5
Component: engine
2017-05-05 19:20:11 +02:00
Gaetan de Villele 34dfa67eac daemon refuses unknown filters in prune functions
- container prune
- volume prune
- image prune
- network prune

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 71760ae648e0597cb7c0f33b67fee55807c7293e
Component: engine
2017-05-05 09:37:06 -07:00
Ian Campbell bd17f42bef Add docker build --iidfile=FILE
This is synonymous with `docker run --cidfile=FILE` and writes the digest of
the newly built image to the named file. This is intended to be used by build
systems which want to avoid tagging (perhaps because they are in CI or
otherwise want to avoid fixed names which can clash) by enabling e.g. Makefile
constructs like:

    image.id: Dockerfile
    	docker build --iidfile=image.id .

    do-some-more-stuff: image.id
    	do-stuff-with <image.id

Currently the only way to achieve this is to use `docker build -q` and capture
the stdout, but at the expense of losing the build output.

In non-silent mode (without `-q`) with API >= v1.29 the caller will now see a
`JSONMessage` with the `Aux` field containing a `types.BuildResult` in the
output stream for each image/layer produced during the build, with the final
one being the end product.  Having all of the intermediate images might be
interesting in some cases.

In silent mode (with `-q`) there is no change, on success the only output will
be the resulting image digest as it was previosuly.

There was no wrapper to just output an Aux section without enclosing it in a
Progress, so add one here.

Added some tests to integration cli tests.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
Upstream-commit: 5894bc1abf8186802d360d20739b57bfffed51df
Component: engine
2017-05-05 16:35:54 +01:00
Daniel Nephin a3ce4c9995 Fix a rare case where using FROM scracth as NAME would fail
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 28379bd29a88a58dee8bf8f4059f3f7854ec8249
Component: engine
2017-05-05 11:14:03 -04:00
Harald Albers 82696bf486 Update bash completion for log driver options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bad7d1fa2fcf22f0fb941d07d5d25fc4eea4f73f
Component: engine
2017-05-05 16:52:33 +02:00
Akihiro Suda 5ce7dab3ff Merge pull request #33033 from YuPengZTE/devReadAll
check err
Upstream-commit: b61ffbfb527cf9d9998b8d2c514749a51e7640ae
Component: engine
2017-05-05 22:33:23 +09:00
Brian Goff bf769e943b Merge pull request #32972 from thaJeztah/compose-move-labels-to-3.3
Move "labels" to compose 3.3 format
Upstream-commit: 4662d3e9beab85389a57d12cfe082ba00aabc915
Component: engine
2017-05-05 09:25:43 -04:00
Harald Albers 5f6211cd9e Add bash completion for --health-start-period
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cbf8c07e9ea30ceef1007fd2857ce2dab6d05517
Component: engine
2017-05-05 15:04:44 +02:00
Brian Goff 99b906ec9d Merge pull request #32952 from dnephin/refactor-builder-dispatch-state
[Builder] Move dispatch state to a new struct
Upstream-commit: b106dd8b5754c12ffa2b0518faec98798d3e4c3a
Component: engine
2017-05-05 09:00:57 -04:00
Harald Albers e4b60b0fda Add bash completion for new devicemapper storage options
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 37747a0fcef5ca2d68023e5486afb4bc4d1ff50b
Component: engine
2017-05-05 14:31:22 +02:00
Vincent Demeester cd011dde74 Merge pull request #33035 from YuPengZTE/devCheckpointList
check err
Upstream-commit: 5f0ea4d0164ca722777a74d82174f81925b5c2a2
Component: engine
2017-05-05 14:24:48 +02:00
Brian Goff fb69291f3e Merge pull request #31104 from cpuguy83/dm_lvmsetup
Add option to auto-configure blkdev for devmapper
Upstream-commit: 05ad14fc1bc5626895a419a991fcf8932eb91d27
Component: engine
2017-05-05 07:35:24 -04:00
yupengzte 806df9b043 check err and add print
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 130d1491b7d813937d30169829d95ad58e0b54a6
Component: engine
2017-05-05 14:50:00 +08:00
yupengzte a7c561e6df check err
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 0d99cb862997d9421d5c5c4dc96983067ddc4d84
Component: engine
2017-05-05 13:33:40 +08:00
Sebastiaan van Stijn bd96b9098d Merge pull request #32951 from wsong/patch-2
Add a proper type to the Source field in Mount
Upstream-commit: 118d4ee1230119c1e0be4b9946593916d85ca386
Component: engine
2017-05-04 17:09:25 -07:00
Tonis Tiigi b61f5e2e48 Allow checking out any ref in gitutils
Also changes so that shallow fetch is performed
even when a specific ref is specified.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 493a6c3d41bbe4f5741c27cf8af2e88af65485d2
Component: engine
2017-05-04 14:14:50 -07:00
Daniel Nephin 965d054208 Some refactoring of dispatch()
Remove runConfig from Builder and dispatchRequest. It is not only on
dispatchState.

Move dispatch state fields from Builder to dispatchState

Move stageName tracking to dispatchRequest.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2f0ebba0e7f43908a41d5ff9bbb1b9b78743a6ab
Component: engine
2017-05-04 17:11:08 -04:00
Tibor Vass 5e5e88ff06 Merge pull request #33019 from tianon/docker-crossplatforms
Only set DOCKER_CROSSPLATFORMS from env if it's set
Upstream-commit: a74833aa70539ce0a2627e24ec9d78945348ad05
Component: engine
2017-05-04 12:22:32 -07:00