toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,462 Commits 3 Branches 295 Tags
fb773f89ff797f7f03087f133b80414134a393eb
Commit Graph
19462 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhang Wei acccf55db2 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>
Upstream-commit: 08944cdef7397752a686ea800e110a8fa14ce719
Component: engine
 2015-10-20 23:07:33 +08:00
Brian Goff 348b7977d8 Merge pull request #17196 from liaoqingwei/16756-docker_cli_info_test 
Use of checkers on docker_cli_info_test.go
Upstream-commit: aa8abf637ad1a2ccd44208ee0d59b24635c71555
Component: engine
 2015-10-20 10:48:20 -04:00
Tibor Vass 47faea6d70 Merge pull request #17191 from mrjana/restart 
Fix docker startup failure due to dangling endpoints
Upstream-commit: 566964bf73475e994ca605bd2106de045509d23f
Component: engine
 2015-10-20 10:32:33 -04:00
moxiegirl 0c4bb86354 Merge pull request #17192 from HuKeping/docs-update 
Docs: update docs for API stats
Upstream-commit: e92a735d7016ec79d0b0a91c0f003b2de2dabf9f
Component: engine
 2015-10-20 06:15:58 -07:00
Phil Estes 9aebf5450b 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)
Upstream-commit: ae8c004dc18c59fec9cd67759a5e0087300e872d
Component: engine
 2015-10-20 08:59:48 -04:00
liaoqingwei 009460477c Use of checkers on docker_cli_import_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
Upstream-commit: 288214e5aecefd5477678e3dfb3f3fed0dcab23b
Component: engine
 2015-10-20 19:58:16 +08:00
Brian Goff cd977f222f 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
Upstream-commit: 89bfbb15162d3745cc871addcd74b2e5f464cfb9
Component: engine
 2015-10-20 07:21:28 -04:00
Mohammed Aaqib Ansari f55f43d04c Using checkers assert for integration-cli/docker_cli_events_unix_test.go 
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
Upstream-commit: bc478b453f630dc47e558096fb5545735de86d2e
Component: engine
 2015-10-20 07:04:55 -04:00
Hu Keping 57a4cfdd46 Docs: update docs for API stats 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 969f1d9773509940666a87f8342168bd2a8cf06d
Component: engine
 2015-10-20 16:31:20 +08:00
liaoqingwei 08d2bcc589 Use of checkers on docker_cli_info_test.go. 
Signed-off-by: liaoqingwei <liaoqingwei@huawei.com>
Upstream-commit: 37b3cd421fcad5513f22a27983167895f4a6cc8d
Component: engine
 2015-10-20 13:38:55 +08:00
Jana Radhakrishnan e1c8600cf0 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>
Upstream-commit: 8adfc7e2d2d158a08096f60ff9318db5bb0875bd
Component: engine
 2015-10-19 21:29:35 -07:00
Jana Radhakrishnan f3edec8c49 Vendoring libnetwork 
Vendoring libnetwork @ 05890386de89e01c73f8898c2941b020bbe57052

Has bug fixes for 1.9

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 9750dd0088bbb23968a19a74f5ae8c58b56328fc
Component: engine
 2015-10-19 21:29:26 -07:00
Sven Dowideit 57010d523d Merge pull request #16801 from aidanhs/aphs-add-socat-t 
Update ambassador image, use the socat -t option
Upstream-commit: b826215c575e320f0cad7c07f8bfdf85437c1be9
Component: engine
 2015-10-20 14:24:25 +10:00
Sebastiaan van Stijn e0385bf5ca Merge pull request #17094 from GabrielNicolasAvellaneda/docs-fixes 
MINOR documentation fix.
Upstream-commit: 310725c9331f6f294ab759698e707052efb7bf09
Component: engine
 2015-10-19 18:36:42 -07:00
Jess Frazelle ebd613a0a8 Merge pull request #17088 from Microsoft/sjw/archive_hang_fix 
Fixing hang in archive.CopyFileWithTar with invalid dst
Upstream-commit: 98c01c2c90c529ed3cbf219bea3f57ba1848e582
Component: engine
 2015-10-19 17:18:25 -07:00
Jess Frazelle e19e8cf7db Merge pull request #17187 from mavenugo/dopts 
Fail the container start if the network has been removed
Upstream-commit: 48147d287b85975a8235c8d49a9e3cacce1a1534
Component: engine
 2015-10-19 17:12:07 -07:00
Jessica Frazelle 2b52981204 add test script for built debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 14e85c8c556bae67584e71f5c4bb6322c77a3ef5
Component: engine
 2015-10-19 16:15:27 -07:00
Jessica Frazelle ee5b4b81d9 add generate aa profile to deb install 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8369f00d30cc1d7823723dec6147f0419e67ad46
Component: engine
 2015-10-19 16:15:25 -07:00
Jessica Frazelle 7b13db8ce9 add dh-apparmor & apparmor to deb builder dockerfiles 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c39689ca70193f9fdc60a3ae3dbfd0ef979966ba
Component: engine
 2015-10-19 16:15:22 -07:00
Jessica Frazelle d4a80fd40a change default docker-engine profile to a template based on apparmor_parser version 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8cf89245f5b5f9abb066f599cb69bfe0202bae5d
Component: engine
 2015-10-19 16:15:18 -07:00
Jessica Frazelle 3fd414a4f5 fix copy of multiple rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f549b1c9ea7ff99f9f17e59d65f234d93e85c36c
Component: engine
 2015-10-19 16:14:06 -07:00
Jess Frazelle 779d8e4c54 Merge pull request #17186 from LK4D4/icc_clear 
Use more clear message for icc=false + iptables=false
Upstream-commit: b135f758d73e8fa1df5f331e866fb250235f3db4
Component: engine
 2015-10-19 15:40:41 -07:00
Jess Frazelle 7958c67364 Merge pull request #17135 from albers/completion-restart-unless-stopped 
Bash completion for restart policy `unless-stopped`
Upstream-commit: c766bcdc735fcedc9a95103082134e7744f23de3
Component: engine
 2015-10-19 15:26:16 -07:00
Jess Frazelle 7955574657 Merge pull request #17148 from albers/completion-dm-options 
bash completion: support for more devicemapper options
Upstream-commit: 6f4d7dfbf450d95a5df104838aec7cfc59246d46
Component: engine
 2015-10-19 15:25:27 -07:00
Madhu Venugopal e4a8ee278c Fail the container start if the network has been removed 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8755920d0d1b3ef0d094bd75b25018b06d19839a
Component: engine
 2015-10-19 15:00:07 -07:00
Vivek Goyal f6f1715608 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>
Upstream-commit: 2f16895ee94848e2d8ad72bc01968b4c88d84cb8
Component: engine
 2015-10-19 17:51:17 -04:00
Alexander Morozov ae482ee1b1 Use more clear message for icc=false + iptables=false 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ab495ab0d0a340dc45ce283dd7e2de6110485156
Component: engine
 2015-10-19 14:19:21 -07:00
Tibor Vass b4f9b290d4 Merge pull request #17128 from calavera/network_controller_enabled 
Do not initialize the networking routes when netController is not enabled.
Upstream-commit: 82a8a14c4d039579f80b640b5f815964e99db746
Component: engine
 2015-10-19 16:13:31 -04:00
Tibor Vass 7c21f5021c Merge pull request #17116 from dmcgowan/increase-ping-timeout 
Increase ping timeout for registries
Upstream-commit: 1ab5ca2d5bece1167f73aa7566202edabb0e969b
Component: engine
 2015-10-19 16:10:01 -04:00
Morgan Bauer d8e401cd76 use gocheck asserts instead of fatal 
- for #16756

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: eedeeaf49c49cc75ab30a01676736637224ddd8a
Component: engine
 2015-10-19 12:30:22 -07:00
Stefan J. Wernli 5eb96cf0cf Fixing hang in archive.CopyWithTar with invalid dst 
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: a150eee3085e2e1e4dbaecdd9668deb0ba3ab26b
Component: engine
 2015-10-19 11:56:05 -07:00
Dan Walsh 3d77e3349b Docker is calling cont.Destroy twice on success 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 0c518b6ab2b2ed481f7f7da3e38f5f2becfc5b2f
Component: engine
 2015-10-19 14:53:55 -04:00
David Calavera 33442d477a Merge pull request #16957 from MHBauer/eventsservice-refactor 
refactor access to daemon member EventsService
Upstream-commit: b27fa6c58e020b35d725b89badb82dbbc5cb84bc
Component: engine
 2015-10-19 11:45:29 -07:00
Tonis Tiigi 1b16dfd5d6 Don’t overwrite layer checksum on push 
After v1.8.3 layer checksum is used for image ID
validation. Rewriting the checksums on push would
mean that next pulls will get different image IDs
and pulls may fail if its detected that same
manifest digest can now point to new image ID.

Fixes #17178

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: fb4a7256921b9863bd27079ec821b9612368fee8
Component: engine
 2015-10-19 11:44:16 -07:00
David Calavera b8b4d2b3f7 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>
Upstream-commit: eb982e7c00192c8306f9c420fb469f087c7b161d
Component: engine
 2015-10-19 14:40:18 -04:00
Antonio Murdaca 372d5d880d Return empty Config fields, now omitempty, for API < 1.21 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 850bc0838a509d220bc78e47aa8203420aca22eb
Component: engine
 2015-10-19 19:09:36 +02:00
Antonio Murdaca a641f84771 Merge pull request #17125 from calavera/check_exec_start_json 
Check the content type is json when calling exec start.
Upstream-commit: bb085b76619e8e73e39f68efb1b407e16da67822
Component: engine
 2015-10-19 18:44:42 +02:00
Morgan Bauer ab68eef7dd refactor access to daemon member EventsService 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 2abf5d986ec6779555ea615763d3ffccede6121a
Component: engine
 2015-10-19 09:41:29 -07:00
Doug Davis f37af18747 Merge pull request #17115 from mountkin/tag-on-build 
Proposal: emit a "tag" event when building image with "-t" parameter
Upstream-commit: e62fd33d963cdba947a9ef5abe100a9d85c58f24
Component: engine
 2015-10-19 12:35:58 -04:00
Vincent Demeester ffce7de9f8 Merge pull request #16710 from gbarboza/sort_port_display 
Sort PORTS order in docker ps output
Upstream-commit: 6e0f00ed0a28d8303197afbf418c32d408819992
Component: engine
 2015-10-19 18:24:24 +02:00
Brian Goff 6f63293742 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`
Upstream-commit: df15523745756f2837b436f35621ae16e624fd86
Component: engine
 2015-10-19 12:10:31 -04:00
Brian Goff a6401cddfe Merge pull request #16986 from clnperez/test-inspect-warn-fix 
Fix TestInspectInt64 for kernels without swap limit capability
Upstream-commit: d0b4e7a0642b129f7b927c45b1e140372b28ac76
Component: engine
 2015-10-19 11:54:28 -04:00
David Calavera f0927e3716 Check the content type is json when calling exec start. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 45dc57f22931e6cb8ad522602da8aa985bddcfab
Component: engine
 2015-10-19 11:46:44 -04:00
Garrett Barboza d4f1e8054e Change sorting method and add test to DisplayablePorts 
Signed-off-by: Garrett Barboza <garrett@garrettbarboza.com>
Upstream-commit: c4c6d33bbcacab113f874b7407499c5f71cf72a0
Component: engine
 2015-10-19 10:38:54 -05:00
Christy Perez 35d6e8b916 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>
Upstream-commit: ae29bd435bafad06f4701c4fbdf6aa8e106409e3
Component: engine
 2015-10-19 08:56:32 -05:00
Brian Goff cd8273e40c Merge pull request #17127 from gesellix/docs-filters-query 
docs: fix description of `filters` param for /volumes and /networks.
Upstream-commit: 8005dbd748103357949e6ece5cad35fcb3f15018
Component: engine
 2015-10-19 09:49:37 -04:00
Lei Jitang f833d205f0 Make default tls host work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fbb01b816288c5cf3eb79358c035072766b6e0f0
Component: engine
 2015-10-19 21:17:37 +08:00
Phil Estes 4a486cfe36 Merge pull request #17155 from janten/meitner 
Correct Lise Meitner's name, add Euler and Noether
Upstream-commit: 8eba018b610e425960ffb4620dd7a0bfde5238d9
Component: engine
 2015-10-19 08:26:55 -04:00
Phil Estes 9688b9f21e Merge pull request #17166 from echo33/docker_cli_diff_test 
use of checkers on docker_cli_diff_test.go
Upstream-commit: 1f9557ac66740fa4c722f0d80e2d8e00b0ca6b5f
Component: engine
 2015-10-19 08:25:32 -04:00
Phil Estes eb8940de3d Merge pull request #17167 from liaoqingwei/16756-docker_cli_inspect_experimental_test.go 
Use of checkers on docker_cli_inspect_experimental_test.go
Upstream-commit: 1c783567c06e52288bbff73168ee3596e2d357e7
Component: engine
 2015-10-19 08:21:17 -04:00