Commit Graph

2029 Commits

Author SHA1 Message Date
1214abd05f Merge pull request #16877 from cxxly/16756-refactor-docker_hub_pull_suite_test
Use Assert statement to replace condition judgment
Upstream-commit: 2491f6c95a5c893e8ffe18a9b3d6982b2cfc4bcd
Component: engine
2015-10-09 09:57:14 -07:00
a680c1ca97 Merge pull request #16881 from cxxly/16756-refactor-docker_cli_stats_test
update integration-cli/docker_cli_stats_test.go use Assert statement
Upstream-commit: a77d80d9d1ac7e807e12004707ce4b6907873fec
Component: engine
2015-10-09 09:55:41 -07:00
3b6afa7db5 Merge pull request #16843 from ZJU-SEL/16756-fix-rename-test
#16756 update rename test
Upstream-commit: c2df663851250d85d659d104b1a3380607249919
Component: engine
2015-10-09 11:23:46 -04:00
7d67d2acff Merge pull request #16870 from cxxly/16756-refactor-docker_cli_proxy_test
refactor docker_cli_proxy_test.go
Upstream-commit: 19ff8e09ba76cd0cabef8e5e87e4c999d7baf2d3
Component: engine
2015-10-09 15:43:39 +02:00
85749dbc68 use gocheck asserts instead of fatal
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
Upstream-commit: 22d0be5797fd5561c999e08701e64258ff9d9536
Component: engine
2015-10-09 08:34:02 -04:00
0ead9a0735 update integration-cli/docker_cli_stats_test.go use Assert statement
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 90a81f6af256b93bf61d56ff06b84828d4d05b7a
Component: engine
2015-10-09 18:24:32 +08:00
97dbafb510 Use Assert statement to replace condition judgment
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: ee7fdbe8b9ff6ed48d183d2160c4ad5a2d713261
Component: engine
2015-10-09 17:45:28 +08:00
e67d897bad update docker_cli_proxy_test.go
Part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 1db161768ccfc67d36034f06db36451b6cc6a214
Component: engine
2015-10-09 14:53:56 +08:00
c402376705 refactor docker_cli_proxy_test.go
part of #16756

Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
Upstream-commit: 14f43406a38b1f66ab60b5235bde4b0121eed093
Component: engine
2015-10-09 11:11:05 +08:00
824a6e360c Merge pull request #16862 from cpuguy83/bump_runc
Bump runc
Upstream-commit: e7ef8633d5b098d930a6670fb0217061e1a75755
Component: engine
2015-10-08 19:09:47 -07:00
74340a2f1e Merge pull request #16859 from diogomonica/changing-trust-server-checks
Changing trustServer allowed URL validation
Upstream-commit: a1d432301d08f6fbf4da792c0b35a67cfdbc770e
Component: engine
2015-10-08 18:33:35 -07:00
5d84a009ca Changing trustServer allowed URL behavior
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: a2f9fb7777ab4ff90747a1fe67dda9046686acad
Component: engine
2015-10-08 17:47:25 -07:00
caa88a80a6 Fix exp tests cast protodriver to naivediffdriver
A recent change made `graphdriver.NaiveDiffDriver` from a function to a
struct. New function is `graphdriver.NewNaiveDiffDriver.

The graphdriver plugin PR was created (and tests run) before this change
was introduced causing the failure to not be seen until after merge.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a705ca017349b9d4c71e22de795e7dda40a5ecce
Component: engine
2015-10-08 19:44:50 -04:00
59099af0ea Bump runc
Fixes a race when starting a container when there is an error, the stdio
streams are not always written.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d9f5f1954cf3ba9c1f9644d7997033d5d62ab34b
Component: engine
2015-10-08 17:07:00 -04:00
510810895d Merge pull request #16366 from MHBauer/logs-refactor
refactor logs to not use internal data structures
Upstream-commit: 01cd67e752aa8a2a7fa9605d5c53bc95862a4d7b
Component: engine
2015-10-08 14:05:02 -07:00
57e2d9f131 Merge pull request #13777 from cpuguy83/graphdriver_extpoints
Create extpoint for graphdrivers
Upstream-commit: 4c55464dd3fbbecb0e67f9b33c54f62f3982b500
Component: engine
2015-10-08 13:46:42 -07:00
90f924b006 Merge pull request #16817 from cpuguy83/explicit_volume_ls
Make `docker volume` behave like `docker network`
Upstream-commit: 9123f77a78c8565e83b8c42a4f14dd0c75f0af66
Component: engine
2015-10-08 11:36:51 -07:00
fe5747bb6d Merge pull request #15693 from vdemeester/15659-image-label-filter
Fix #15659 : filter by label for docker images commited
Upstream-commit: 41c99cc62161376981d1c24f30c0e340124778e8
Component: engine
2015-10-08 11:14:51 -07:00
f28b4afc30 Merge pull request #16669 from sunyuan3/TestRunInValidCPUShares
add TestRunInValidCPUShares
Upstream-commit: 683ee205620e5e622cb13e3d4e14524b3d92dd96
Component: engine
2015-10-08 19:38:21 +02:00
6c42b9a51f Merge pull request #16815 from duglin/fixHelp
Fix help test comment to align with the code
Upstream-commit: 2b6af905faacc5eff0f1b3263974f5af12a92ed4
Component: engine
2015-10-08 09:29:32 -07:00
e67f107724 Merge pull request #16783 from Microsoft/10662-cliwait
Windows CI: cli_wait_test
Upstream-commit: 4a9d039721ac16b07dffb784b2c1e3f884f62459
Component: engine
2015-10-07 19:39:32 -07:00
5cf2935c37 add TestRunInValidCPUShares
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 042d08a2a89c040b2fc7d97d8cc22a6c4593e275
Component: engine
2015-10-08 10:04:51 +08:00
8c3d5b861b refactor logs to not use internal data structures
- refactor to make it easier to split the api in the future
 - additional tests for non existent container case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 1eecc1e7e57f3b96878df01fd32596bc485117a8
Component: engine
2015-10-07 15:44:16 -07:00
3a210ffac2 Windows CI: Fix cli_wait_test
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e666dfff9b7b82b026f9d45d8a8cb0d9193f0b56
Component: engine
2015-10-07 12:57:41 -07:00
6b3f6691b5 Merge pull request #16645 from mavenugo/ux
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
80c6a28fe2 Merge pull request #16807 from jfrazelle/rename-flag
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
d6696485ff Make docker volume behave like docker network
Before, typing `docker volume` with no args would forward to the handler
for `docker volume ls`, except the flags for the `ls` subcommand were
not supported.
Instead just print the cmd usage.

This makes the behavior of the `docker volume` subcommand behave exactly
like the `docker network` subcommand.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2feebd95d33c4eb4073f5477860491626a9c19c6
Component: engine
2015-10-07 13:36:46 -04:00
3ba7e5f650 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
fde720d014 Fix help test comment to align with the code
I disagree with #14546 that pushed the help text past 80 chars.
Aside from it now making the help text look ugly on 80 char displays,
which I use, one thing I like about the previous limitation is that it
forced us to keep our options down to more reasonable phrases/words.
For example, I think
`    --disable-content-trust=true`
could have been:
`    --disable-trust=true`
or even:
`    --disable-ctrust=true`

But regardless, let's at least make the comments match what the code does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 73a6ac00cebd0cf9a68a922aa0d4aa61d4ff84d6
Component: engine
2015-10-07 05:09:46 -07:00
45997573a5 Network UX and integration tests
* Exiting experimental network UX
* removed experimental service UX
* integrated with the new network remote API

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22a9ba090eb3cc1bc6c851785a876b064df7341a
Component: engine
2015-10-07 03:54:27 -07:00
8623fdfb48 Network remote APIs using new router, --net=<user-defined-network> changes
* Moving Network Remote APIs out of experimental
* --net can now accept user created networks using network drivers/plugins
* Removed the experimental services concept and --default-network option
* Neccessary backend changes to accomodate multiple networks per container
* Integration Tests

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ab94e11a2a8499088a72ab27fd09e897d8c810a
Component: engine
2015-10-07 03:54:19 -07:00
d3031c000f Merge pull request #16758 from HuKeping/update-test
Update test
Upstream-commit: 0137e3eda2bae42a83cecd967249e4da54f2fa52
Component: engine
2015-10-07 07:09:13 +02:00
5a9d726a00 Merge pull request #16147 from tiborvass/refactor-builder
Refactor builder with new Go interfaces
Upstream-commit: 2606a2e4d3bf810ec82e373a6cd334e22e504e83
Component: engine
2015-10-06 20:36:07 -04:00
c90c198590 Update test
Use of checkers on Integration test.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 28cff8bd031adcc2937918c2630139b81140af2a
Component: engine
2015-10-07 07:11:45 +08:00
d8db4defa7 Abstract builder and implement server-side dockerfile builder
This patch creates interfaces in builder/ for building Docker images.
It is a first step in a series of patches to remove the daemon
dependency on builder and later allow a client-side Dockerfile builder
as well as potential builder plugins.

It is needed because we cannot remove the /build API endpoint, so we
need to keep the server-side Dockerfile builder, but we also want to
reuse the same Dockerfile parser and evaluator for both server-side and
client-side.

builder/dockerfile/ and api/server/builder.go contain implementations
of those interfaces as a refactoring of the current code.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e0ef11a4c2c6789e08b61df082b5b9aa70898e7a
Component: engine
2015-10-06 19:10:19 -04:00
fca0f83907 Merge pull request #16752 from vdemeester/skip-TestExecStartFails-on-windows
Skip TestExecStartFails on windows
Upstream-commit: 7c19f660b3a0f5e5551ea8af2b3cc9b5266c2ada
Component: engine
2015-10-06 13:52:51 -07:00
1bddd2d12a No error shadow pullImageIfNotExist
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7009a4b3ad7e495be61a61e9aacc5e263073670
Component: engine
2015-10-06 11:38:23 -07:00
5d2ec8fed8 Move builder files to builder/dockerfile
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f41230b93a77ca7f4d84718f39a4847b6117f694
Component: engine
2015-10-05 18:26:47 -04:00
9d1d2940bc Merge pull request #16776 from shishir-a412ed/docker_tag_error_msg
Make docker tag error message more user friendly
Upstream-commit: aac5c44c10c8a862782a410b75273646ba2e6e9c
Component: engine
2015-10-05 22:06:29 +02:00
d3de206cf9 Make docker tag error message more user friendly
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 582a24e937d1e0746b91a13bacd7f5fd65a38741
Component: engine
2015-10-05 15:19:34 -04:00
0eed66fc40 Merge pull request #16769 from LK4D4/fix_volume_socket
Allocate resources for server API before daemon creation
Upstream-commit: 80f2e3f0c6d8c439ba0d4b53162dcf1610ad2d46
Component: engine
2015-10-05 20:48:41 +02:00
c12ca2de3a Allocate resources for server API before daemon creation
It prevents occupying of those resources (ports, unix-sockets) by
containers.
Also fixed false-positive test for that case.

Fix #15912

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 5eda566f937dddef9d4267dd8b8b1d8c3e47b290
Component: engine
2015-10-05 09:32:08 -07:00
e846ce8223 Merge pull request #16530 from dnephin/filter_events_by_label
Filter events by labels
Upstream-commit: e86291edd88641cc866c842d0f4a8f8296820aeb
Component: engine
2015-10-04 20:36:42 +02:00
ec3df7c39d While #16738 is "fixed", skip TestExecStartFails
… on windows

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: dc204b87864a06d37f9515b57bd6f76dac24a016
Component: engine
2015-10-04 18:38:21 +02:00
a3a78e3ce4 Merge pull request #16509 from HuKeping/search-problem
Fix docker search problem
Upstream-commit: b78f66c472399bf56bd5110dbdaac5e5676396c8
Component: engine
2015-10-04 18:21:32 +02:00
a66830822a Fix docker search problem
Search terms shouldn't be restricted to only full valid repository
names. It should be perfectly valid to search using a part of a name,
even if it ends with a period, dash or underscore.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: f04e8fdb9bbcdad28de5c328b7de3f3abdae0b5a
Component: engine
2015-10-04 23:23:43 +08:00
1dfde818a2 Resolves #16458 - filter events by labels.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 08b117517d6d6b5daebe4c056c135e1598f44385
Component: engine
2015-10-02 16:33:20 -04:00
3b057aaeb2 Merge pull request #16250 from cpuguy83/15487_exec_error_codes
Make exec start return proper error codes
Upstream-commit: 5a43beda91efd9a53c798082abbc5b287167aa0c
Component: engine
2015-10-02 12:55:17 -07:00
56b56acf38 Merge pull request #16708 from jfrazelle/fix-shm-mqueue-when-mounted-from-host
do not mount /dev/shm or /dev/mqueue if we are mounting from the host
Upstream-commit: 662f55d11d2f278daf5b9be215608540af35be4d
Component: engine
2015-10-02 15:13:59 -04:00
a9fcaeb043 Make exec start return proper error codes
Exec start was sending HTTP 500 for every error.

Fixed an error where pausing a container and then calling exec start
caused the daemon to freeze.

Updated API docs which incorrectly showed that a successful exec start
was an HTTP 201, in reality it is HTTP 200.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2d43d93410c29cec87deb9cd940c3b2a8af5fbbb
Component: engine
2015-10-02 14:40:22 -04:00