da50e3fb15
Merge pull request #17343 from fgimenez/16756-refactor-docker_cli_external_graphdriver_unix_test-to-use-checker
...
Use checker assert for docker_cli_external_graphdriver_unix_test.go
Upstream-commit: b21f95c6125cf183fe04bcb23f40f3bffbddca54
Component: engine
2015-10-26 15:39:08 -04:00
07425589a1
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
Upstream-commit: 34439f3ecb5cbde2f733e162179dfbe57dbaabff
Component: engine
2015-10-26 10:06:45 -07:00
5c51a1e94a
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
Upstream-commit: 9328fc7e62e703ac5bae7de5fdf9c02dbcccb034
Component: engine
2015-10-26 13:58:21 +01:00
15e5b8010a
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es >
Upstream-commit: 7058ec278dcd27fce62c50b1e462aca8ade42439
Component: engine
2015-10-26 09:09:38 +01:00
d8b43fba9e
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
Upstream-commit: 75128c46c7881325c87de8797b455534558784ed
Component: engine
2015-10-25 20:39:32 -04:00
e52c395265
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ead62b59522bba132b9a14712e4350439e7fa2a5
Component: engine
2015-10-25 17:17:29 -07:00
e999854115
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
Upstream-commit: c71e97fc122d82c4bd99e47b38000d216bf360f2
Component: engine
2015-10-25 21:17:50 +01:00
b01426a7bc
Fix for #17243 DockerSuite.TestExecAfterContainerRestart.
...
Added waitRun(containerID) statement after docker run -d and docker restart
to ensure the container is restarted before issuing a exec cmd.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 2a5f04dcc900888ff706e36e6360d0b51d82bed1
Component: engine
2015-10-25 21:43:31 +05:30
107977a6ca
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
Upstream-commit: 271f85afac94b224a8e2d4dd99936bafba18a473
Component: engine
2015-10-25 11:04:27 -04:00
082dcadcb4
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
...
This is done by calling waitRun() followed by the docker run, which ensures the container is loaded
before calling docker exec to obtain the env variable set previously.
Incorporated the change as suggeted by duglin.
Signed-off-by: Anil Belur <askb23@gmail.com >
Upstream-commit: 6d974ec19d2f484586ec57c2e2455a6de927cddf
Component: engine
2015-10-24 22:54:24 +05:30
ca2f6a1a48
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com >
Upstream-commit: 04b6b0b47fab7751b716b0b6c8ce3b98a8c51e99
Component: engine
2015-10-23 22:32:56 -05:00
213dc33b1a
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: be1c77595eed1d9b22511faf64783e4c65f40c61
Component: engine
2015-10-23 19:46:28 -07:00
27d55a1112
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
1489d6cd3f
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
Upstream-commit: 448398c2a8a41b6589dd7deb59fdc889e78db223
Component: engine
2015-10-23 13:50:35 -07:00
a4eeeb73b3
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: c2eb37f9aeb6215293483e02613514e49011cf2c
Component: engine
2015-10-24 00:59:56 +08:00
9345ffc645
Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test
...
Using checkers assert for integration-cli/docker_cli_experimental_test.go
Upstream-commit: b972a6e3f8087ae054633c70659c3597a0e10e18
Component: engine
2015-10-23 09:44:32 -04:00
71f91ad534
Using checkers assert for integration-cli/docker_cli_experimental_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: ff91c8ac1ac35c2e2d68f78d1b972c97f6484342
Component: engine
2015-10-22 20:29:18 -04:00
a78999351d
Merge pull request #17284 from calavera/buffer_inspect_template
...
Fail when there is an error executing an inspect template.
Upstream-commit: 21aecf62a0064ead695e338f5dfcf8ecab5069f4
Component: engine
2015-10-22 17:06:16 -07:00
dad1c1a473
Fail when there is an error executing an inspect template.
...
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3b9c13873afdfe6c884e1265397d7c5cb9cd5c5c
Component: engine
2015-10-22 19:24:50 -04:00
0b6eb0de48
Merge pull request #17278 from mavenugo/etchosts
...
Vendoring libnetwork & libkv with fixes
Upstream-commit: 37da495d4cf30bebb17397dd9e103e6d3e74fe08
Component: engine
2015-10-22 19:02:02 -04:00
b4d3175bf2
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
Upstream-commit: 4c253ddf204f0c8ebc58c1aa5796c689d623e16b
Component: engine
2015-10-22 17:14:49 -04:00
9dc1141005
Add integ-test for fixed--cidr == bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 5b53839326621e8796fee88e376fc4ca42ed980f
Component: engine
2015-10-22 14:12:46 -07:00
e1f1cd631a
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f664f6e4b19d4e155d78af2eacddcd941dae4fce
Component: engine
2015-10-22 23:00:59 +02:00
95b57bebf2
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
553ed6afa5
Turn off service discovery when icc==false
...
- Turn off built-in service discovery on docker0 bridge
when icc is false
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 20faaaa872444b6fffbc5a6d30310a782caafe0f
Component: engine
2015-10-22 12:02:02 -07:00
f7f7ce4926
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
a97ff526a8
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
Upstream-commit: 48fe12af0c785d62ac852ea8428a9789a4e9d7fd
Component: engine
2015-10-22 08:34:50 +02:00
04eb439359
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 710817a71b40287acc546fe2e08367b2a02dae54
Component: engine
2015-10-22 15:53:17 +08:00
dc90c0567e
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
Upstream-commit: bf8ba3d0c970c53890924bd1bf65cb593329df6f
Component: engine
2015-10-21 14:01:59 -07:00
533bd1241f
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec
Component: engine
2015-10-21 16:00:25 -04:00
4a8a97b06e
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
Upstream-commit: 9f031f70ce832a5f3fde7bd902e66abeb44f19a9
Component: engine
2015-10-21 11:09:02 -07:00
91b1ec8aba
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
Upstream-commit: 6a7c38a57d865afc89e4d6ec388bae3b9bedb870
Component: engine
2015-10-21 14:02:22 -04:00
e3fa9b6aba
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: dc813c7d137d3e673b68ad4a2996f254d195f1d9
Component: engine
2015-10-21 17:53:59 +00:00
6672204b41
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
2015-10-21 10:21:27 -07:00
b1184809c8
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
Upstream-commit: bb5551746bdccc1b032fbf8c32914c282ff94668
Component: engine
2015-10-21 12:00:07 -04:00
efb4544862
graph: ensure _tmp dir is always removed
...
Also remove unused func `newTempFile` and prevent a possible deadlock
between pull_v2 `attemptIDReuse` and graph `register`
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: f6577be1c93150149c291f9d18375d7bcae9ebb1
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148
graph: add parent img refcount for faster rmi
...
also fix a typo in pkg/truncindex package comment
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
f13bda05a2
integration-cli: docker_cli_build_test: check error before defer
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 04ef69a1e963e0c9bc9b685188f2c584ef275e45
Component: engine
2015-10-21 17:13:45 +02:00
6af2fef213
Using checkers assert for integration-cli/docker_cli_export_import_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: e72f92cb99b73469909dbb28fb5eedaadba9022b
Component: engine
2015-10-21 08:57:20 -04:00
9086b77304
Add support for multiple network in inspect
...
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.
`docker network inspect host bridge none` is possible now.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
2015-10-21 08:57:29 +02:00
c3f438b95a
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 37627427a2ad9dcb06a2a6ea958670683a6c7934
Component: engine
2015-10-20 19:56:59 -07:00
a8c08d4980
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
834dc8ee1e
Merge pull request #17177 from runcom/bc-fixes
...
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
988eb3b3bf
Do not mask ipam driver if no ip config is passed
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
e65f97a6f3
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
Upstream-commit: b7fcc71a3c1d63be6f1133d02b29f6298c4f02ff
Component: engine
2015-10-20 19:51:15 +02:00
ccde1983ec
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 414cfe946719a0ba811c95486d523e003d44fcc1
Component: engine
2015-10-20 12:03:11 -04:00
acccf55db2
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 08944cdef7397752a686ea800e110a8fa14ce719
Component: engine
2015-10-20 23:07:33 +08:00
348b7977d8
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
Upstream-commit: aa8abf637ad1a2ccd44208ee0d59b24635c71555
Component: engine
2015-10-20 10:48:20 -04:00
cd977f222f
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
Upstream-commit: 89bfbb15162d3745cc871addcd74b2e5f464cfb9
Component: engine
2015-10-20 07:21:28 -04:00
f55f43d04c
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
Upstream-commit: bc478b453f630dc47e558096fb5545735de86d2e
Component: engine
2015-10-20 07:04:55 -04:00
