David Calavera
37849ce1fb
Merge pull request #17184 from cpuguy83/fix_external_volume_tests
...
Fix bug in volume driver test implementation
2015-11-04 12:08:11 -08:00
Brian Goff
3564895e84
Fix network settings inspect tests
...
Makes sure the containers are actually running when inspecting so the
ip info is actually populated.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-11-03 12:12:19 -05:00
Doug Davis
c90125dc8a
Merge pull request #17637 from aaronlehmann/network-test-name-typo
...
Fix typo in name of integration test TestInspectApiMultipeNetworks
2015-11-02 20:42:36 -05:00
Aaron Lehmann
701e5dfe8a
Fix typo in name of integration test TestInspectApiMultipeNetworks
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-11-02 17:30:16 -08:00
David Calavera
65cbf37bf7
Merge pull request #17626 from mavenugo/ith
...
IT for ungraceful daemon restart with multiple host-mode containers
2015-11-02 15:38:14 -08:00
Derek McGowan
6964f42350
Merge pull request #17557 from aaronlehmann/update-distribution
...
Vendor updated version of docker/distribution
2015-11-02 14:37:04 -08:00
Madhu Venugopal
b323e3df8b
IT for ungraceful daemon restart with multiple host-mode containers
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-11-02 14:00:11 -08:00
Aaron Lehmann
257c59251b
Vendor updated version of docker/distribution
...
This updates the vendored docker/distribution to the current master
branch.
Note the following changes:
- The manifest package was split into manifest/schema1. Most references
to the manifest package in the engine needed to be updated to use
schema1 instead.
- Validation functions in api/v2 were replaced by the
distribution/reference package. The engine code has been updated to
use the reference package for validation where necessary. A future PR
will change the engine to use the types defined in
distribution/reference more comprehensively.
- The reference package explicitly allows double _ characters in
repository names. registry_test.go was updated for this.
- TestPullFailsWithAlteredManifest was corrupting the manifest JSON, now
that the schema1 package unmarshals the correct payload. The test is
being changed to modify the JSON without affecting its length, which
allows the pull to succeed to the point where digest validation
happens.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-11-02 12:40:18 -08:00
David Calavera
beeec6d103
Merge pull request #17558 from aboch/nw
...
Fix bug in initializeNetwork()
2015-11-02 12:15:41 -08:00
David Calavera
920ab75bd5
Merge pull request #17598 from zelahi/16756-dockercli-createtest
...
Added c.Assert statements to docker_api_create_test.go
2015-11-02 11:43:20 -08:00
Alessandro Boch
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
Alexander Morozov
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
Zuhayr Elahi
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
Antonio Murdaca
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
Phil Estes
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
Arnaud Porterie
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
Brian Goff
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
Alessandro Boch
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
David Calavera
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
Vincent Demeester
05534b6f80
Merge pull request #17518 from WeiZhang555/integration-test-bug
...
bug fix for test cases
2015-10-30 16:56:35 +01:00
Shijiang Wei
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
Brian Goff
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
Vincent Demeester
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
Antonio Murdaca
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
Zhang Wei
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
Aditi Rajagopal
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
David Calavera
2eaa25d355
Merge pull request #17499 from jfrazelle/fix-lxc-tests
...
lxc does not support exec
2015-10-29 15:08:13 -07:00
Alexander Morozov
7f7950aa18
Merge pull request #17490 from aboch/pm
...
Libnetwork vendoring & overlay networking fixes
2015-10-29 13:45:19 -07:00
David Calavera
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
Jessica Frazelle
aaa134ea0e
lxc does not support exec
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-29 11:51:59 -07:00
Alessandro Boch
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
Brian Goff
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
Jessica Frazelle
1a6a860c14
cant run volume on windows
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-29 08:55:48 -07:00
Wen Cheng Ma
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
Jessica Frazelle
44da86172a
fix experimental tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-10-28 21:14:45 -07:00
Lei Jitang
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
Derek McGowan
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
Zuhayr Elahi
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
Jess Frazelle
b227d19cae
Merge pull request #17423 from cpuguy83/so_sensitive
...
Revert "dockerversion placeholder for library-import"
2015-10-27 18:32:18 -07:00
Brian Goff
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86 .
Commit caused issues on systems with case-insensitive filesystems.
Revert for now
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-10-27 21:23:53 -04:00
David Calavera
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
Brian Goff
2266462f72
Merge pull request #17373 from Microsoft/10662-volumetests
...
Windows: Volume integration tests
2015-10-27 19:52:11 -04:00
David Calavera
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
Brian Goff
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
David Calavera
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
Alexandre Beslic
85ae8b034a
Merge pull request #17364 from mavenugo/advertise
...
Enhancing --cluster-advertise to support <interface-name>
2015-10-27 13:29:18 -07:00
James Carey
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
Lei Jitang
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
David Calavera
64854277f8
Merge pull request #17390 from sanimej/libn
...
Vendor in libnetwork changes to support container rename
2015-10-27 13:21:15 -07:00
Vincent Demeester
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