83279055ee
Merge pull request #33045 from albers/completion--health-start-period
...
Add bash completion for `--health-start-period`
Upstream-commit: 2a7a938da42d5e522c3bdd455c5eb936dcc8f0df
Component: engine
2017-05-10 15:54:43 +02:00
4d8c6f2827
Merge pull request #31012 from cpuguy83/do_not_remove_containers_on_error
...
Do not remove containers from memory on error
Upstream-commit: 815e8bb885c3d9f70ab763d9844e857590b40ad3
Component: engine
2017-05-10 06:21:28 -04:00
f04e158c49
Merge pull request #33114 from dnephin/fix-builder-warn-on-unused-builtint
...
Fix warning for unused build args
Upstream-commit: 22a03192fbf10f583003135421fcbc72c38f1ee4
Component: engine
2017-05-10 09:38:07 +02:00
3cfa1e91a7
Merge pull request #33094 from darrenstahlmsft/RevendorGoWinio
...
Update go-winio to v0.4.0 (go 1.8.x works on Windows)
Upstream-commit: 80bb6a46a33d0396b3a8b15dc8c0ad81e05682b6
Component: engine
2017-05-09 22:46:31 -07:00
88971970c1
Merge pull request #33123 from johnstep/windows-respect-client-repo
...
Update make.ps1 to respect client repo
Upstream-commit: c68612de0cb526bdcec20a9708c241284468942c
Component: engine
2017-05-09 19:03:50 -07:00
d781af028f
Update go-winio to v0.4.0
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 24d41778595722d2d318eba45d9e723aaa918b20
Component: engine
2017-05-09 17:49:55 -07:00
b4be63f0ee
Merge pull request #33089 from Microsoft/jjh/hccsshimv0.5.16
...
Revendor Microsoft\hcsshim @ v0.5.17
Upstream-commit: d1a7ea147c92c296dea9ff9de077afafd9222eb0
Component: engine
2017-05-09 19:21:20 -04:00
89b14a8486
Merge pull request #32997 from dnephin/fix-builder-scratch-with-name
...
Fix a rare case where using FROM scratch as NAME would fail
Upstream-commit: 543dfde6370e2d9b959fe1f8bcf0e51125d75af2
Component: engine
2017-05-09 18:15:33 -04:00
88c1779859
Merge pull request #32145 from ripcurld0/fix_32120
...
Disable HTML escaping for JSON in formatter
Upstream-commit: 3d7af24f63281570edf7f6b254cfd568e5e19aec
Component: engine
2017-05-10 06:54:56 +09:00
d8ca5cea6c
Update make.ps1 to respect client repo
...
Signed-off-by: John Stephens <johnstep@docker.com >
Upstream-commit: 2bc6fffacbec76a49d2e43ddf06e9f80c4651e8d
Component: engine
2017-05-09 13:07:09 -07:00
6044c2ae89
Merge pull request #32792 from rogaha/extra_prometheus_metrics
...
Add extra prometheus metrics
Upstream-commit: 1a6f8a92b2c5912058828d560f52281ba0424472
Component: engine
2017-05-09 21:48:34 +02:00
e62db10e7c
make it clearer which packages to install for AUFS support
...
Signed-off-by: Steve Desmond <steve@vtsv.ca >
Upstream-commit: 089c2e2131ac65d73a25499ee6746b07d0f63b6c
Component: engine
2017-05-09 15:02:33 -04:00
cce43bed79
Revendor Microsoft\hcsshim @ v0.5.17
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 1bb3f57c45274e48f675a4548adc030deedda74c
Component: engine
2017-05-09 11:44:14 -07:00
25ad1db09f
Merge pull request #32909 from cpuguy83/32907_volume_unmount_on_cp
...
Add refcount for MountPoint
Upstream-commit: 09ff5ce29c82b6c97123b24855e1ef11e860b47a
Component: engine
2017-05-09 20:15:41 +02:00
9f46bc72fd
Merge pull request #33111 from cpuguy83/rerun_vendor
...
Re-run vndr
Upstream-commit: 9c537b95de9a556908c7decc8fccd87f19d455a7
Component: engine
2017-05-09 13:32:28 -04:00
05b49d64e0
Merge pull request #33110 from dnephin/remove-some-hack
...
Remove compose-bindata script, it should move to docker/cli
Upstream-commit: 781ff2bcffd3997c16465a852dfedbda128457b0
Component: engine
2017-05-09 19:29:56 +02:00
0116db53b1
Merge pull request #32930 from gjaskiewicz/master
...
gcplogging driver MRPB for VM set
Upstream-commit: 3a2d68a8a0191f968014f86500006543ad09897c
Component: engine
2017-05-09 19:29:23 +02:00
d96165077e
Merge pull request #33105 from YuPengZTE/devContentReader
...
check err
Upstream-commit: 9370b6ac2d5de32cbebc063cdb74716b050b9064
Component: engine
2017-05-09 09:44:35 -07:00
3a59c54458
Fix warning for unused build args.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 72cc81ee8dcfca5503f3a02289f8f3d4a08582ad
Component: engine
2017-05-09 11:25:33 -04:00
8a093adb5c
Merge pull request #32670 from perweij/fix-Dockerfile-instruction
...
Correcting test-instruction.
Upstream-commit: a762ceace4e8c1c7ce4fb582789af9d8074be3e1
Component: engine
2017-05-09 17:20:42 +02:00
600b71450c
Re-run vndr
...
Now that the CLI is gone there are lots of packages that need to be
pruned from vendor.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5122abeb4416c742255cb85d364d7d25d7f5ce32
Component: engine
2017-05-09 10:59:25 -04:00
064c831d96
Merge pull request #32983 from allencloud/add-disk-usage-test-in-client
...
add disk usage test for client package
Upstream-commit: 66bc8f128ca6718f70b1e8d468196457ca6b98bd
Component: engine
2017-05-09 16:44:43 +02:00
4999ae4553
Remove compose-bindata script, it should move to docker/cli
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 47cceb7f2c475e1798e8f339dfd4ad988eeaef42
Component: engine
2017-05-09 10:38:36 -04:00
b7a6083d94
Merge pull request #33062 from ColinHebert/remove_cli_3.3
...
Remove compose 3.3 schema
Upstream-commit: 7f968435f6e412250b8e6d7211401e2c4b9a2859
Component: engine
2017-05-09 16:21:21 +02:00
ddcae36da7
gcplogging driver MRPB set
...
Signed-off-by: Grzegorz Jaśkiewicz <gj.jaskiewicz@gmail.com >
Upstream-commit: d925e5047067c2014a3769d41bebd5c837e4cae3
Component: engine
2017-05-09 14:24:43 +02:00
adc143e6c5
check err
...
Signed-off-by: yupengzte <yu.peng36@zte.com.cn >
Upstream-commit: 595901bd7ed629222dbcbf43724b2d2bca66464f
Component: engine
2017-05-09 19:24:21 +08:00
a7451e12cd
Add extra prometheus metrics
...
- buildsTriggered
- buildsFailed
- valid options:
metricsDockerfileSyntaxError,
metricsDockerfileEmptyError,
metricsCommandNotSupportedError,
metricsErrorProcessingCommandsError,
metricsBuildTargetNotReachableError,
metricsMissingOnbuildArgumentsError,
metricsUnknownInstructionError,
metricsBuildCanceled,
- engineInfo
Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com >
Upstream-commit: a28b173a780cd06db6d93197c54b00a7d616b3dc
Component: engine
2017-05-09 01:04:40 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
