7f7950aa18
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
cdfd9846f4
Merge pull request #17460 from dmcgowan/fix-rmi-force-tag
...
Fix rmi -f removing multiple tags
2015-10-29 13:01:06 -07:00
e03daebb48
Execute buildPortMapInfo after Endpoint.Join()
...
- As the retrieved info may not be available at
Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-29 11:47:30 -07:00
8d62f243c7
Merge pull request #17488 from jfrazelle/skip-windows-test
...
cant run volume on windows w remote daemon host
2015-10-29 13:37:39 -04:00
1a6a860c14
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 08:55:48 -07:00
44da86172a
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-28 21:14:45 -07:00
48e7f7963e
Fix rmi -f removing multiple tags
...
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-10-28 16:07:02 -07:00
b227d19cae
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86
2015-10-27 21:23:53 -04:00
9ab71b68af
Merge pull request #17393 from tiborvass/carry-17360
...
Carry Fix docker inspect container only reports last assigned information
2015-10-27 17:00:41 -07:00
2266462f72
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
2015-10-27 19:52:11 -04:00
25682577c9
Extract network settings types for inspect.
...
Keeping backwards compatibility.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-10-27 19:16:21 -04:00
1c8ee617d1
Merge pull request #17382 from jecarey/16765-docker_cli_images_test
...
Use of checkers on docker_cli_images_test.go
2015-10-27 17:25:45 -04:00
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
85ae8b034a
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
5814d67f98
Use of checkers on docker_cli_images_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-27 15:26:38 -05:00
1b9a08e719
Fix docker inspect container only reports last assigned information
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-27 16:26:06 -04:00
64854277f8
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
d5cd032a86
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
3e7db73b99
Enhancing --cluster-advertise to support <interface-name>
...
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it automation friendly using
docker-machine.
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-27 11:03:22 -07:00
4f6f00e191
Do not update etc/hosts for every container
...
- Only user named containers will be published into
other containers' etc/hosts file.
- Also block linking to containers which are not
connected to the default network
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-26 20:08:57 -07:00
f3f63c6044
Merge pull request #17257 from echo33/docker_cli_exec_test
...
use of checkers on docker_cli_exec_test.go
2015-10-26 23:14:38 +01:00
962243e387
Merge pull request #17256 from liaoqingwei/16756-docker_cli_config_test
...
Use of checkers on docker_cli_config_test.go
2015-10-26 23:00:04 +01:00
2af5034ce8
Windows: Volume integration tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 14:33:28 -07:00
2dd822f322
Merge pull request #17206 from liaoqingwei/16756-docker_cli_import_test
...
Use of checkers on docker_cli_import_test.go
2015-10-26 13:42:02 -07:00
8173acca95
Merge pull request #17374 from brahmaroutu/fix_gccgo_ci
...
GCCGO requires more memory and time to start containers, fixing GCCGO…
2015-10-26 13:33:59 -07:00
5cf028d3dd
Merge pull request #17313 from calavera/version_exec_json_check
...
Version exec json check.
2015-10-26 13:32:32 -07:00
74a881c9e4
Merge pull request #17368 from HuKeping/update-test
...
Update docker_cli_build_unix_test
2015-10-26 13:21:31 -07:00
b21f95c612
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
2015-10-26 15:39:08 -04:00
0b5e628e14
Version exec json check.
...
Keep backwards compatibility with old versions of the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-26 15:12:06 -04:00
2046ba3e3c
GCCGO requires more memory and time to start containers, fixing GCCGO x86 CI
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-26 19:09:00 +00:00
34439f3ecb
Merge pull request #17351 from mavenugo/predefined
...
Prevent user from deleting pre-defined networks
2015-10-26 10:06:45 -07:00
f410d7e70f
Update docker_cli_build_unix_test
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-26 21:06:11 +08:00
9328fc7e62
Merge pull request #17222 from maaquib/16756-integration-cli-export-import-test
...
Using checkers assert for integration-cli/docker_cli_export_import_test.go
2015-10-26 13:58:21 +01:00
7058ec278d
Use checker assert for integration-cli/docker_cli_external_graphdriver_unix_test.go
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-26 09:09:38 +01:00
d1ed5f62ad
Use of checkers on docker_cli_config_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-26 10:51:12 +08:00
9120a1fc3e
use of checkers on docker_cli_exec_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-26 10:01:48 +08:00
75128c46c7
Merge pull request #17189 from maaquib/16756-integration-cli-unix-events-test
...
Using checkers assert for integration-cli/docker_cli_events_unix_test.go
2015-10-25 20:39:32 -04:00
ead62b5952
Prevent user from deleting pre-defined networks
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-25 17:17:29 -07:00
c71e97fc12
Merge pull request #17332 from askb/17225_flakytest_TestExecEnv
...
Fix for the issue #17225 flaky test DockerSuite.TestExecEnv test case.
2015-10-25 21:17:50 +01:00
2a5f04dcc9
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>
2015-10-25 21:43:31 +05:30
271f85afac
Merge pull request #17325 from aboch/d0
...
Disable built-in SD on default bridge network
2015-10-25 11:04:27 -04:00
6d974ec19d
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>
2015-10-24 22:54:24 +05:30
04b6b0b47f
Use of checkers on docker_cli_history_test.go
...
Signed-off-by: James Carey <jecarey@us.ibm.com>
2015-10-23 22:32:56 -05:00
be1c77595e
Disable built-in SD on docker0 network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-23 19:46:28 -07:00
3b16a8c91c
integration-cli test for active container rename and reuse
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2015-10-23 16:26:24 -07:00
e74cf8acad
Merge pull request #16433 from Microsoft/10662-volumes5
...
Windows: [TP4] Add volume support
2015-10-23 18:43:07 -04:00
448398c2a8
Merge pull request #15780 from mountkin/build-multi-tags
...
Add ability to add multiple tags with docker build
2015-10-23 13:50:35 -07:00
c2eb37f9ae
Add ability to add multiple tags with docker build
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-24 00:59:56 +08:00
b972a6e3f8
Merge pull request #17287 from maaquib/16756-integration-cli-experimental-test
...
Using checkers assert for integration-cli/docker_cli_experimental_test.go
2015-10-23 09:44:32 -04:00
Alexander Morozov
David Calavera
Alessandro Boch
Brian Goff
Jessica Frazelle
Derek McGowan
Jess Frazelle
Alexandre Beslic
James Carey
Lei Jitang
Vincent Demeester
Madhu Venugopal
Vincent Demeester
John Howard
Michael Crosby
Srini Brahmaroutu
Hu Keping
Antonio Murdaca
Federico Gimenez
liaoqingwei
weiyan
Anil Belur
Tibor Vass
Sebastiaan van Stijn
Shijiang Wei