Commit Graph

1879 Commits

Author SHA1 Message Date
5e00b6c763 Merge pull request #14626 from kunalkushwaha/add-network-cli-help
"docker network" missing from docker --help
Upstream-commit: a796ac53185c2827017843fec21e02aba88f6ace
Component: engine
2015-09-09 13:36:43 -07:00
154c412ece Merge pull request #15798 from calavera/volume_driver_host_config
Move VolumeDriver to HostConfig to make containers portable.
Upstream-commit: 9ca4aa479788867cd2dce161efa1e43ea5dfc14f
Component: engine
2015-09-08 22:05:40 -04:00
5f33863cc9 Merge pull request #16157 from runcom/add-missing-err-check-integration-cli-run
integration-cli: add missing err check
Upstream-commit: a58aa9d8899c55d328fbfcdd8f61dd72b738fa52
Component: engine
2015-09-08 17:26:10 -07:00
ebd47f0636 Merge pull request #16158 from duglin/Issue16146
Add --help to "docker volume inspect --help" output
Upstream-commit: 4b4597ae17d4fd8843aa9367fd1aa790cc74f7f6
Component: engine
2015-09-08 19:50:22 -04:00
22903b10c1 Merge pull request #16096 from vdemeester/14756-final-golints
Final bits of enabling golint on the code base 🐹
Upstream-commit: 634a848b8e3bdd8aed834559f3b2e0dfc7f5ae3a
Component: engine
2015-09-08 15:25:55 -07:00
d879adf33b Add --help to "docker volume inspect --help" output
Closes #16146

While in there, modified the testing infrastructure for the help text
so that we can get commands with nested commands - like "volume".

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 87255b6721f4dc02ae34696f2013537fdc967a99
Component: engine
2015-09-08 14:24:00 -07:00
4bdf1be246 integration-cli: add missing err check in TestRunNetworkNotInitializedNoneMode
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: d5a705b60036b1a914486bf700546e26e75e9e9d
Component: engine
2015-09-08 23:05:54 +02:00
fcbe186c1d Update validate-lint to find go files by itself
… and fixes the last bits that were missing :3.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 0c70eb83813af6d5266769bc908593f9660b13f1
Component: engine
2015-09-08 22:07:42 +02:00
1e6922e84b Fix docker volume dangling filter
The docker volume ls -f dangling=true filter was
inverted; the filtered results actually returned all
non-dangling volumes.

This fixes the filter and adds some integration tests
to test the correct behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 1cbf9047b3be1bee39a72e96808581ff3c312a6c
Component: engine
2015-09-06 20:17:56 +02:00
2b2fcd8cea Remove dead code
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: c957d9c768a3c2e56b31db09399b49b8dc66c3c1
Component: engine
2015-09-06 19:52:39 +08:00
c03ccb6893 Windows: Get Integration CLI running
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: f9a3558a9d75ed6a2f9f1b2d80800226afaa74a5
Component: engine
2015-09-04 12:32:40 -07:00
cd76a76b2f Temp: Turn off dockerhubpullsuite on Win2Linux CI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 0b18b1b3095ec8a937e76e02b9f0805972cff734
Component: engine
2015-09-04 11:53:40 -07:00
4792ea30e7 Merge pull request #16065 from Microsoft/10662-fix2panics
Fixes 2 panics initialising tests
Upstream-commit: 6b14d9a64576197901c9a498caef3cc6f7f3bc43
Component: engine
2015-09-04 11:07:17 -07:00
4ec4a9a12d Merge pull request #16039 from icecrime/update_pull_tests
Update pull tests
Upstream-commit: 5b46d8f0fa2a687f748d65697bc094e69d039455
Component: engine
2015-09-04 09:52:41 -07:00
6aeaa4026b Merge pull request #15999 from cpuguy83/15994_ext_volume_bind
Set bind driver after volume is created
Upstream-commit: 7c667f9d6e506fb502426f2d98db8c0c124fe03b
Component: engine
2015-09-04 09:47:10 -07:00
350911ed1c Move VolumeDriver to HostConfig to make containers portable.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 6549d6517bf9a7c79d21a86cbf36af10fcdbfbe0
Component: engine
2015-09-04 12:42:44 -04:00
b8b3d17b1b "docker network" missing from docker --help
Fixed issues related to network subcommand tests
- "network" in exempted list of short help check
- Condition for exact test modified to meet experimental commands
- Sorting of commands done in flags_experimental

Signed-off-by: Kunal Kushwaha <kunal.kushwaha@gmail.com>
Upstream-commit: 44da5c3de2c763c4bc42a74051ad7a37adf1f553
Component: engine
2015-09-04 15:34:17 +09:00
1f9dd04dfa Merge pull request #15877 from Microsoft/10662-trigger
Fix trigger count and output
Upstream-commit: 0009852cb0ceadc398c9d30c7f5494848004c20f
Component: engine
2015-09-03 20:04:05 -07:00
1c8b6d6152 Fixes 2 panics initialising tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 69bf17ffbd67fdfbbfbdb09bf7e183ffcfc7811e
Component: engine
2015-09-03 18:26:38 -07:00
e579f48cbf Merge pull request #15845 from calavera/refactor_daemon_list
Refactor daemon container list.
Upstream-commit: c8c1c472b21fbe7079f5fccbbda8d9652c7c00d3
Component: engine
2015-09-03 20:48:54 -04:00
bbd3497cdd Fix trigger count and output
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 662010292619c33db7f144890abfdd9a99b423e0
Component: engine
2015-09-03 17:39:19 -07:00
0249cbd7d9 Update image pull tests
Update and migrate existing tests to the `DockerHubPullSuite`. Most
tests were preserved, but refactored and made more exhaustive. One test
was deliberately removed (`TestPullVerified`) as it is unreliable and
that the feature was obsoleted by content trust.

Move all trust related tests to `docker_cli_pull_trusted_test.go`.

Move tests depending on a local registry to `docker_cli_pull_local_test.go`.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f324f4851f28edfd8dab82cd624a4ec1f01cd207
Component: engine
2015-09-03 15:57:41 -07:00
595af68c98 Add integration-cli/checker package
Add a `checker` package that adds some utility Checker implementation,
the first one being `checker.Contains`, as well as brining all go-check
provided Checker implementations in scope as a commodity.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: c87cbd3862336fb01addff5d753ff7c8e0d50879
Component: engine
2015-09-03 15:57:41 -07:00
2f2b355be9 Merge pull request #16038 from aboch/sbx
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
Upstream-commit: 288275ab60c049fa644f1ce5d36c0c005e8dd02c
Component: engine
2015-09-03 11:48:02 -07:00
813cd9d35e Add test suite for push/pull code
Introduce the `DockerHubPullSuite` that interacts with its own dedicated
daemon, thus allowing to start from a clean environment and finely test
against the impact of isolated push and pull operations.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 9e4addde76f4aea4613f09215084812b6a357521
Component: engine
2015-09-02 22:06:24 -07:00
357660a251 Docker changes for libnetwork Sandbox
- Ground-work for integrating with user namespace support

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 56fdb05258d1ab2153fec268ed22cf9d1227c356
Component: engine
2015-09-02 17:24:56 -07:00
ee5c0b914e Set bind driver after volume is created
When using a named volume without --volume-driver, the driver was
hardcoded to "local".
Even when the volume was already created by some other driver (and
visible in `docker volume ls`), the container would store in it's own
config that it was the `local` driver.
The external driver would work perfecly fine until the daemon is
restarted, at which point the `local` driver was assumed because that is
as it was set in the container config.

Set the bind driver to the driver returned by createVolume.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 39be36658d559d0fe28c902ad0f45287868c7ebb
Component: engine
2015-09-02 20:13:20 -04:00
9980495b3c Remove TestPushInterrupt
This test relies on a race condition, and has been failing often in CI.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 6cc38775bbff9b9304e551b26593af9c867c61bb
Component: engine
2015-09-02 15:30:55 -07:00
49cb61bb67 Merge pull request #15921 from srust/volume_driver_register_retry
Retry registering a volume driver
Upstream-commit: 1ed3cb2b6c47d7e3d83882181346f0b9708f3e2c
Component: engine
2015-09-02 11:24:52 +02:00
3ce116129d Retry registering a volume driver
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: 45fdce8a0d36d9b0825a6dfb6634a81f9af258af
Component: engine
2015-09-01 14:56:29 -04:00
6bbc3d3c6c Merge pull request #15983 from Microsoft/unix-run-test
Move run tests out of unix files
Upstream-commit: 70f0d6d84c77a3c425d2d6e790730b5abe2abcca
Component: engine
2015-09-01 10:49:01 -07:00
e3bcc2a340 Move run tests out of unix files
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d7eb85bb1f0076ccffbec7c9291cc27d2cc4cc03
Component: engine
2015-09-01 09:42:19 -07:00
4dabd24bfd Moved unix links tests to non-platform
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4fccf8adfa50855afa0ffaed1ea5c22ddaa7b2e4
Component: engine
2015-09-01 09:10:24 -07:00
c770771c57 Merge pull request #15976 from duglin/MissingDefer
Add missing defer to delete temp dir
Upstream-commit: 26fb160610dc5195ef8d84f972a3fc215541a1b3
Component: engine
2015-09-01 17:13:37 +02:00
9783af1dd1 Add missing defer to delete temp dir
Minor thing I just noticed

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 51e721ab072441ba6ae14b84613cf2b3acd6316b
Component: engine
2015-09-01 07:19:38 -07:00
81b8a83415 Merge pull request #15900 from Microsoft/10662-testinfra
Test infrastructure for cross platform
Upstream-commit: 567687fd98d471a3b4a04ba0aa3a595c931799ef
Component: engine
2015-09-01 09:18:29 -04:00
b060726a85 Merge pull request #15963 from Microsoft/fix-unixtestport
Move TestPort out of _unix
Upstream-commit: 84bc41a3fb8a0150448caca8f5f4d7f1a00e23b3
Component: engine
2015-08-31 17:09:59 -07:00
8216c91a01 Fix typo in test title
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3c2b128582bc8ea786b5486578c43d97167805fe
Component: engine
2015-08-31 15:28:40 -07:00
dece7c3355 Move TestPort out of _unix
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 68c7d24a12ca54d052cdc033c06f27c19ee5bab0
Component: engine
2015-08-31 14:40:36 -07:00
cd128eab1d Merge pull request #15606 from jlhawn/img_delete
[daemon] Refactor image_delete.go
Upstream-commit: 96974170f8ca82dedffbfe54e84b6b1b2f5661d2
Component: engine
2015-08-31 18:22:48 +02:00
e382bc454d Test infrastructure for cross platform
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: cd18e7bb739b7681507aca48fec36db9104a5e89
Component: engine
2015-08-31 09:10:18 -07:00
aa64926347 Merge pull request #15807 from coolljt0725/remove_remove_redundant_tag_name
Minor fix: remove redundant tag name in error message of create failed.
Upstream-commit: 754c10430b1d0e6247e2cdd150bc15291ff87de0
Component: engine
2015-08-31 11:34:40 -04:00
f2ca32df70 Refactor daemon container list.
Separate container iteration, filtering and reducing.
This will make easier in the future to improve the implementation of
docker ps as we know it.

The end goal is to unify the objects returned by the api for docker ps
and docker inspect, leaving all docker ps transformations to the client.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 06699f73fb6d779894a875f9177afc5a1f3bc5b3
Component: engine
2015-08-31 04:24:08 -04:00
f57ea43d07 Merge pull request #15873 from cpuguy83/no_args_for_volume_subcmd
Fix `docker volume invalidarg` so it displays usage
Upstream-commit: 754d81bd69801a25e1b0d2d51bb2c20c8771c01b
Component: engine
2015-08-31 10:04:45 +02:00
58471ed642 Minor fix: remove redundant tag name in error message of create failed.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 16220e06810c38b8e531c3508221458ffb330e97
Component: engine
2015-08-30 10:43:33 +08:00
a9bff20ad7 Don't hold lock around volume driver for volume create.
Signed-off-by: Stephen Rust <srust@blockbridge.com>
Upstream-commit: 0ef740a5bf093aa544802ccfbb0612e04ed8492a
Component: engine
2015-08-28 16:28:28 -04:00
f6d5f51a76 [daemon] Refactor image_delete.go
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 111d2f348767692a34366ff5cd01f607cf54ad57
Component: engine
2015-08-28 11:01:24 -07:00
aaf90d6259 Merge pull request #14570 from vdemeester/13365-ps-image-filter
Add docker ps ancestor filter for image
Upstream-commit: b1cb1b1df493b3e0b739b9f374b6c82e306dede8
Component: engine
2015-08-28 19:47:43 +02:00
5950954f43 Merge pull request #15023 from hqhq/hq_add_status_in_inspect
Add status string to State field for inspect
Upstream-commit: 6caaa8a63544c052d757aecee93d3488b7b3d9e2
Component: engine
2015-08-28 08:27:36 -07:00
190c9ba004 Use DockerSuite for PullClientDisconnect test
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 9dd6c8822ddccff1952dfd611263ba551693ff7d
Component: engine
2015-08-27 11:22:54 -07:00