081edfed32
Merge pull request #17150 from sdurrheimer/zsh-completion-network-driver-option
...
Add zsh completion for 'docker network create -o --opt'
2015-10-20 15:48:12 -04:00
a7868191d4
Merge pull request #17188 from jfrazelle/fix-release-rpm
...
fix copy of multiple rpms
2015-10-20 11:31:35 -07:00
b7fcc71a3c
Merge pull request #16917 from WeiZhang555/start-inte
...
use of checkers on `integration-cli/docker_cli_start_test.go`
2015-10-20 19:51:15 +02:00
a2d1ec06e6
Merge pull request #16984 from estesp/update-busybox
...
Update Dockerfile to use the correct busybox:latest identifier
2015-10-20 10:35:31 -07:00
7777c1be9b
Merge pull request #17176 from rhvgoyal/fix-locking-issue
...
devmapper: Drop devices lock before returning from function
2015-10-20 13:08:29 -04:00
414cfe9467
Update Dockerfile to use the correct busybox:latest identifier
...
Also requires some tests to be updated which relied on behavior
of a busybox image that wasn't actually "busybox:latest"; meaning these
tests were unable to be verified/run against a real busybox:latest image
on a daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-20 12:03:11 -04:00
ad861876e8
Merge pull request #17035 from estesp/fix-build-dir-perms
...
Correct build-time directory creation with user namespaced daemon
2015-10-20 08:57:19 -07:00
08944cdef7
use of checkers on Integration test
...
Part of #16756
Use c.Assert instead of condition judgement in
integration-cli/docker_cli_start_test.go
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-10-20 23:07:33 +08:00
aa8abf637a
Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test
...
Use of checkers on docker_cli_info_test.go
2015-10-20 10:48:20 -04:00
566964bf73
Merge pull request #17191 from mrjana/restart
...
Fix docker startup failure due to dangling endpoints
2015-10-20 10:32:33 -04:00
e92a735d70
Merge pull request #17192 from HuKeping/docs-update
...
Docs: update docs for API stats
2015-10-20 06:15:58 -07:00
ae8c004dc1
Correct build-time directory creation with user namespaced daemon
...
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.
Add tests for the mkdir variants in pkg/idtools
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-20 08:59:48 -04:00
89bfbb1516
Merge pull request #17052 from echo33/docker_cli_start_volume_driver_unix_test
...
use of checkers on docker_cli_start_volume_driver_unix_test.go
2015-10-20 07:21:28 -04:00
969f1d9773
Docs: update docs for API stats
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-20 16:31:20 +08:00
37b3cd421f
Use of checkers on docker_cli_info_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-20 13:38:55 +08:00
8adfc7e2d2
Fix docker startup failure due to dangling endpoints
...
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-19 21:29:35 -07:00
9750dd0088
Vendoring libnetwork
...
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052
Has bug fixes for 1.9
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-10-19 21:29:26 -07:00
b826215c57
Merge pull request #16801 from aidanhs/aphs-add-socat-t
...
Update ambassador image, use the socat -t option
2015-10-20 14:24:25 +10:00
310725c933
Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes
...
MINOR documentation fix.
2015-10-19 18:36:42 -07:00
98c01c2c90
Merge pull request #17088 from Microsoft/sjw/archive_hang_fix
...
Fixing hang in archive.CopyFileWithTar with invalid dst
2015-10-19 17:18:25 -07:00
48147d287b
Merge pull request #17187 from mavenugo/dopts
...
Fail the container start if the network has been removed
2015-10-19 17:12:07 -07:00
f549b1c9ea
fix copy of multiple rpms
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-19 16:14:06 -07:00
b135f758d7
Merge pull request #17186 from LK4D4/icc_clear
...
Use more clear message for icc=false + iptables=false
2015-10-19 15:40:41 -07:00
c766bcdc73
Merge pull request #17135 from albers/completion-restart-unless-stopped
...
Bash completion for restart policy `unless-stopped`
2015-10-19 15:26:16 -07:00
6f4d7dfbf4
Merge pull request #17148 from albers/completion-dm-options
...
bash completion: support for more devicemapper options
2015-10-19 15:25:27 -07:00
8755920d0d
Fail the container start if the network has been removed
...
Signed-off-by: Madhu Venugopal <madhu@docker.com>
2015-10-19 15:00:07 -07:00
2f16895ee9
devmapper: Drop devices lock before returning from function
...
cleanupDeleted() takes devices.Lock() but does not drop it if there are
no deleted devices. Hence docker deadlocks if one is using deferred
device deletion feature. (--storage-opt dm.use_deferred_deletion=true).
Fix it. Drop the lock before returning.
Also added a unit test case to make sure in future this can be easily
detected if somebody changes the function.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
2015-10-19 17:51:17 -04:00
ab495ab0d0
Use more clear message for icc=false + iptables=false
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-10-19 14:19:21 -07:00
82a8a14c4d
Merge pull request #17128 from calavera/network_controller_enabled
...
Do not initialize the networking routes when netController is not enabled.
2015-10-19 16:13:31 -04:00
1ab5ca2d5b
Merge pull request #17116 from dmcgowan/increase-ping-timeout
...
Increase ping timeout for registries
2015-10-19 16:10:01 -04:00
a150eee308
Fixing hang in archive.CopyWithTar with invalid dst
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-10-19 11:56:05 -07:00
b27fa6c58e
Merge pull request #16957 from MHBauer/eventsservice-refactor
...
refactor access to daemon member EventsService
2015-10-19 11:45:29 -07:00
eb982e7c00
Return 404 for all network operations without network controller.
...
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-19 14:40:18 -04:00
bb085b7661
Merge pull request #17125 from calavera/check_exec_start_json
...
Check the content type is json when calling exec start.
2015-10-19 18:44:42 +02:00
2abf5d986e
refactor access to daemon member EventsService
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-10-19 09:41:29 -07:00
e62fd33d96
Merge pull request #17115 from mountkin/tag-on-build
...
Proposal: emit a "tag" event when building image with "-t" parameter
2015-10-19 12:35:58 -04:00
6e0f00ed0a
Merge pull request #16710 from gbarboza/sort_port_display
...
Sort PORTS order in docker ps output
2015-10-19 18:24:24 +02:00
df15523745
Merge pull request #16854 from WeiZhang555/inte-test
...
use of checkers on `integration-cli/docker_cli_links_test.go` and `integration-cli/docker_cli_links_unix_test.go`
2015-10-19 12:10:31 -04:00
d0b4e7a064
Merge pull request #16986 from clnperez/test-inspect-warn-fix
...
Fix TestInspectInt64 for kernels without swap limit capability
2015-10-19 11:54:28 -04:00
45dc57f229
Check the content type is json when calling exec start.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-10-19 11:46:44 -04:00
c4c6d33bbc
Change sorting method and add test to DisplayablePorts
...
Signed-off-by: Garrett Barboza <garrett@garrettbarboza.com>
2015-10-19 10:38:54 -05:00
ae29bd435b
Fix TestInspectInt64 for run scenarios that return warnings
...
Instead of returning only the container ID, starting a container may
also return a warning:
"WARNING: Your kernel does not support swap
limit capabilities, memory limited without
swap.\nff6ebd9f7a8d035d17bb9a61eb9d3f0a5d563160cc43471a9d7ac9f71945d061"
The test assumes that only the container ID is returned and uses the
entire message as the name for the inspect command. To avoid the need to
parse the container ID from the output after the run command, give the
container a name and use that instead.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2015-10-19 08:56:32 -05:00
8005dbd748
Merge pull request #17127 from gesellix/docs-filters-query
...
docs: fix description of `filters` param for /volumes and /networks.
2015-10-19 09:49:37 -04:00
8eba018b61
Merge pull request #17155 from janten/meitner
...
Correct Lise Meitner's name, add Euler and Noether
2015-10-19 08:26:55 -04:00
1f9557ac66
Merge pull request #17166 from echo33/docker_cli_diff_test
...
use of checkers on docker_cli_diff_test.go
2015-10-19 08:25:32 -04:00
1c783567c0
Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go
...
Use of checkers on docker_cli_inspect_experimental_test.go
2015-10-19 08:21:17 -04:00
2968fa44eb
emit a "tag" event when building image with "-t" parameter
...
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-10-19 20:09:14 +08:00
f3b2b8700f
Use of checkers on docker_cli_inspect_experimental_test.go.
...
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
2015-10-19 19:44:04 +08:00
a91a874f73
use of checkers on docker_cli_start_volume_driver_unix_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:19:57 +08:00
7be79767c1
use of checkers on docker_cli_diff_test.go
...
Signed-off-by: weiyan <weiyan3@huawei.com>
2015-10-19 19:07:59 +08:00
Tibor Vass