45e71a7984
Fix bug in initializeNetwork()
...
- On `docker run --net <network id> ...`
the bug would cause the container to attempt
to connect to the network two times
- Also made sure endpoint creation rollback will
be executed on failures in `func (container *Container) connectToNetwork()`
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-11-02 11:20:15 -08:00
6563b7d2e8
Merge pull request #17542 from estesp/restart-root-dir-cleanup
...
Fix integration-cli daemon restart with user namespaces enabled
2015-11-02 09:50:12 -08:00
6694326d5d
Added c.Assert statements to docker_api_create_test.go
...
removed the if/else statements and added c.Assert statements for docker_api_create_test.go.
Removed check.commentf in c.Assert statements
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-11-01 19:54:19 -08:00
29c9717cac
Merge pull request #16903 from cxxly/16756-refactor-docker_cli_netmode_test
...
refactor docker_cli_netmode_test .go with Assert statement
2015-11-01 11:07:54 +01:00
0c57b9f5b3
Fix integration-cli daemon restart with user namespaces enabled
...
The `d.root` dir is resolved to the full path to the graph dir after the
daemon starts, but on restart, should be set back to the parent (without
the "<uid>.<gid>" ending) so that it uses/resolves to the same graphdir
on restart.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-31 14:39:33 -04:00
5719d01066
Merge pull request #16579 from coolljt0725/fix_attach_paused_container
...
Add show error when attach to a paused container
2015-10-31 07:43:22 -07:00
cccb6bce7d
Merge pull request #17524 from mountkin/fix-teardown
...
dont try to remove builtin networks in teardown
2015-10-30 20:59:57 -04:00
e16e794805
IT for daemon restarts when container connected to multiple networks
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-30 16:25:25 -07:00
f301c5765a
Fix network inspect for default networks.
...
- Keep old fields in NetworkSetting to respect the deprecation policy.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-30 16:55:21 -04:00
05534b6f80
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
2015-10-30 16:56:35 +01:00
5970e94072
dont try to remove builtin networks in teardown
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-30 23:05:33 +08:00
2c6351a4a5
Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test
...
Checkers on integration-cli/docker_cli_commit_test
2015-10-30 10:36:41 -04:00
0598ff46ac
Merge pull request #17427 from zelahi/16756-dockercli-killtest
...
modified docker_cli_kill_test.go to use c.Asserts
2015-10-30 12:56:52 +01:00
77488b90c5
Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test
...
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
2015-10-30 12:41:14 +01:00
8f53edae3b
bug fix for test cases
...
Fix bug that `isNwPresent` can't distinguish network names with same
prefix.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-30 15:13:35 +08:00
483abbb313
Checkers on integration-cli/docker_cli_commit_test
...
Applying #16756 to integration-cli/docker_cli_commit_test.go
Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
2015-10-29 21:47:54 -05:00
1847641b7b
Fix test file paths
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-29 15:51:04 -07:00
2eaa25d355
Merge pull request #17499 from jfrazelle/fix-lxc-tests
...
lxc does not support exec
2015-10-29 15:08:13 -07:00
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
aaa134ea0e
lxc does not support exec
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-29 11:51:59 -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
f4abc6406e
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
...
Fixes part of #16756
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-10-29 21:38:00 +08:00
44da86172a
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-28 21:14:45 -07:00
de1d611990
Add show error when attach to a paused container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-28 21:00:09 -04: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
5f4cb33a51
Fix volume error messages
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-28 09:23:43 -07:00
d0762a60e0
modified docker_cli_kill_test.go to use c.Asserts
...
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
2015-10-27 21:18:26 -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
e8da75d4a1
Integration test: bridge ip is excluded from the allocator pool
...
Signed-off-by: Federico Gimenez <fgimenez@coit.es>
2015-10-25 09:36:38 +01: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
ff91c8ac1a
Using checkers assert for integration-cli/docker_cli_experimental_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-22 20:29:18 -04:00
21aecf62a0
Merge pull request #17284 from calavera/buffer_inspect_template
...
Fail when there is an error executing an inspect template.
2015-10-22 17:06:16 -07:00
3b9c13873a
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>
2015-10-22 19:24:50 -04:00
37da495d4c
Merge pull request #17278 from mavenugo/etchosts
...
Vendoring libnetwork & libkv with fixes
2015-10-22 19:02:02 -04:00
4c253ddf20
Merge pull request #17275 from vdemeester/17246-tags-to-repotags
...
Use RepoTags & RepoDigest in inspect
2015-10-22 17:14:49 -04:00
5b53839326
Add integ-test for fixed--cidr == bridge network
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-10-22 14:12:46 -07:00
f664f6e4b1
Use RepoTags & RepoDigest in inspect
...
To be coherent with /images/json (images command)
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-22 23:00:59 +02:00
2afdc6582b
Merge pull request #17274 from aboch/ai
...
Turn off discovery when icc == false
2015-10-22 13:08:31 -07:00
20faaaa872
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>
2015-10-22 12:02:02 -07:00
a7e686a779
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-22 10:42:53 -07:00
48fe12af0c
Merge pull request #16784 from MHBauer/test-refactor
...
use gocheck asserts instead of fatal
2015-10-22 08:34:50 +02:00
710817a71b
Use checker on integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-22 15:53:17 +08:00
bf8ba3d0c9
Merge pull request #16908 from brahmaroutu/skip_oom_gccgo
...
Skipping two tests when running with GCCGO (CI)
2015-10-21 14:01:59 -07:00
56ef47e881
Merge pull request #16890 from runcom/perf-boost
...
rmi and build cache miss performance improvements
2015-10-21 16:00:25 -04:00
9f031f70ce
Merge pull request #17218 from vdemeester/17023-network-multiple-inspect
...
Add support for multiple network in inspect
2015-10-21 11:09:02 -07:00
6a7c38a57d
Merge pull request #16940 from coolljt0725/default_tls_host
...
Make default tls host work
2015-10-21 14:02:22 -04:00
dc813c7d13
Skipping two tests when running with GCCGO (CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-10-21 17:53:59 +00:00
492945235b
Merge pull request #17136 from gesellix/change-route-volume-create
...
rename `POST /volumes` to `POST /volumes/create`
2015-10-21 10:21:27 -07:00
bb5551746b
Merge pull request #17229 from mavenugo/ds_fix
...
Fixing bootup inconsistencies due to invalid cluster-store config
2015-10-21 12:00:07 -04:00
f6577be1c9
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>
2015-10-21 17:13:45 +02:00
56f5e3459f
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>
2015-10-21 17:13:45 +02:00
04ef69a1e9
integration-cli: docker_cli_build_test: check error before defer
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-10-21 17:13:45 +02:00
e72f92cb99
Using checkers assert for integration-cli/docker_cli_export_import_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-10-21 08:57:20 -04:00
7af9f988ac
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>
2015-10-21 08:57:29 +02:00
37627427a2
Integration test for default bridge init with invalid cluster config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-20 19:56:59 -07:00
78e2167976
Merge pull request #17202 from aboch/ipa
...
Do not mask ipam driver if no ip config is passed
2015-10-20 19:45:08 -04:00
Alessandro Boch
Alexander Morozov
Zuhayr Elahi
Antonio Murdaca
Phil Estes
Arnaud Porterie
Brian Goff
David Calavera
Vincent Demeester
Shijiang Wei
Zhang Wei
Aditi Rajagopal
John Howard
Jessica Frazelle
Wen Cheng Ma
Lei Jitang
Derek McGowan
Jess Frazelle
Alexandre Beslic
James Carey
Vincent Demeester
Madhu Venugopal
Michael Crosby
Srini Brahmaroutu
Hu Keping
Federico Gimenez
liaoqingwei
weiyan
Anil Belur
Tibor Vass
Sebastiaan van Stijn
Mohammed Aaqib Ansari
Antonio Murdaca