Commit Graph

2011 Commits

Author SHA1 Message Date
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
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
f14e695085 Merge pull request #16159 from runcom/validate-cpuset-cpus
Validate --cpuset-cpus, --cpuset-mems
Upstream-commit: 698e14902a06af0613b697d88935ae0200659bff
Component: engine
2015-10-02 11:30:46 -07:00
0cd51b7f83 add regression test for mounting /dev/shm from host
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 934d9d632313acd338608ca1ad25c5270463e9c0
Component: engine
2015-10-02 11:14:08 -07:00
b8616b16f4 Merge pull request #16076 from vbatts/export_image_times
graph: exported images times matching creation
Upstream-commit: 77da5d8feb5cf88446df0045240b4943ce4fc206
Component: engine
2015-10-01 21:50:43 +01:00
90b9ae3169 save: integration test for timestamp matching
The `docker save`ed output ought to have matching timestamp to the layer
creation.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: e4478caddf78700bd42f94eb382ae1805a443618
Component: engine
2015-10-01 14:38:55 -04:00
568946688a Merge pull request #16385 from RichardScothern/v1-deprecation
Add a daemon flag to prevent contact with v1 registries.
Upstream-commit: 85244f80e324428cef3dc526d1c831ed20eac6c2
Component: engine
2015-09-30 10:10:06 -07:00
a1b5e8a4f8 Merge pull request #16580 from coolljt0725/unpause_all_container_on_exit
Make sure the container will always be unpaused on test exit
Upstream-commit: 729c9a97822ebee2c978a322d37060454af6bc66
Component: engine
2015-09-29 21:44:23 -04:00
2a8c716e73 Merge pull request #16650 from cpuguy83/no_named_volumes_for_builder
Do not parse config.Volumes for named volumes
Upstream-commit: ae03e544e78dd478c72021fa72fd91351553fba5
Component: engine
2015-09-29 17:04:29 -07:00
69db6279aa Revert "Merge pull request #16228 from duglin/ContextualizeEvents"
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.

Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).

This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing
changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967.

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	api/server/container.go
	builder/internals.go
	daemon/container_unix.go
	daemon/create.go
Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78
Component: engine
2015-09-29 14:26:51 -04:00
e87759cf33 Merge pull request #16649 from mtrmac/16648-test-text-fixups
Fix text not matching the actual tests
Upstream-commit: 4e0eb91c5577a0310366d699fbed3b213e7caa38
Component: engine
2015-09-29 12:01:19 -04:00
ca2ed97d93 Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test
Fix TestAttachClosedOnContainerStop racey test
Upstream-commit: 992e464a80e880930817f7622d1b6a5ff63b1033
Component: engine
2015-09-29 11:49:24 -04:00
2f036a6241 Merge pull request #16641 from cpuguy83/16598_fix_TestExecStartFails
Make sure test container is running before exec
Upstream-commit: 499b76d2ecb97ed1e59c732770ccdad6a1c8b3b6
Component: engine
2015-09-29 11:25:14 -04:00
9346a064f4 Fix TestAttachClosedOnContainerStop racey test
This test is failing once in a while on the CI, because the docker
attach command might be called after the container ends.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 50852f3be3d09d8bf6957d2ff27c26966b871e80
Component: engine
2015-09-29 16:57:58 +02:00
5c97861d03 Make sure test container is running before exec
Fixes race in TestExecStartFails

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9077c8968950133fdfac9898a20f9887f8df78f2
Component: engine
2015-09-29 10:06:51 -04:00
4b1e83454e Do not parse config.Volumes for named volumes
Fixes an issue where `VOLUME some_name:/foo` would be parsed as a named
volume, allowing access from the builder to any volume on the host.

This makes sure that named volumes must always be passed in as a bind.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e5bb8fdd37879ec04c3419b8ecfce7a0477cdcf
Component: engine
2015-09-29 10:01:57 -04:00
5950661408 Fix text not matching the actual tests
Also fixes a typo in image name.

Fixes #16648

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Upstream-commit: 8781367c77a915799dff2892f4506f085ac6b68b
Component: engine
2015-09-29 15:26:04 +02:00
1bdb03b312 Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
TestRunUnknownCommand 30s, not 30ns
Upstream-commit: d6e7350b961d856dcc39db5accd898279d1be3da
Component: engine
2015-09-28 14:31:48 -07:00
e1405c129c Windows: Fix TestRunStdinBlockedAfterContainerExit
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4d301f0059c4e2e4ecea1ed41f2c1588b8db6990
Component: engine
2015-09-28 14:08:26 -07:00