toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,248 Commits 3 Branches 295 Tags
a81f232a58992091e6d819e4fd50bb5813327ebf
Commit Graph
18904 Commits
Author SHA1 Message Date
Antonio Murdaca ec12c4920e fix shm size handling 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: ef1d410b0270fa7309d76aded34113396def7fb2
Component: engine
 2015-12-01 16:29:40 +01:00
Phil Estes 142c1d2bdc Merge pull request #18310 from rhvgoyal/log-fs-creation 
devmapper: Log start and end of filesystem creation
Upstream-commit: c8891158bd1499b060346f42f52be45484a3ac94
Component: engine
 2015-12-01 09:49:13 -05:00
Sebastiaan van Stijn 965af57894 Merge pull request #18331 from runcom/fix-typo 
daemon: daemon_experimental.go: fix typo
Upstream-commit: c6a2bce9198efe21ae40213fed2e3c25df9de613
Component: engine
 2015-12-01 15:48:10 +01:00
Sebastiaan van Stijn d58d25e766 Merge pull request #18330 from thaJeztah/re-enable-api-v1.22 
docs: add API v1.22 to the list again
Upstream-commit: 27bfa93b696a955693f1f581e4723a9ea7d1691a
Component: engine
 2015-12-01 14:18:53 +01:00
Vivek Goyal b17c4f91f6 devmapper: Log start and end of filesystem creation 
ext4 filesystem creation can take a long time on 100G thin device and
systemd might time out and kill docker service. Often user is left thinking
why docker is taking so long and logs don't give any hint. Log an info
message in journal for start and end of filesystem creation. That way
a user can look at logs and figure out that filesystem creation is
taking long time.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: a489e685c0d17455463945316cfe366e4e65dca6
Component: engine
 2015-12-01 13:05:46 +00:00
Tibor Vass 935eda07b8 Merge pull request #18318 from calavera/fix_dns_setting_on_hostconfig_start 
Make sure container start doesn't make the DNS fields nil.
Upstream-commit: c247b3d104ad7e768e2540fccb3861c36eb2e60f
Component: engine
 2015-12-01 12:43:16 +01:00
Antonio Murdaca b48e8b7de2 daemon: daemon_experimental.go: fix typo 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4c8088268ccef8652add808e3367faafe713f485
Component: engine
 2015-12-01 12:03:50 +01:00
Sebastiaan van Stijn 2ba0212c1d docs: add API v1.22 to the list again 
The 1.22 API was temporarily removed in e4d86c2c38f4c99660da8ed65a8103e283e07e23
to prevent it showing up in the 1.9 documentation.

This reverts that change and tweaks the aligning
of the table headers in Markdown source.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3ddd21b8b66be248ea04eb74c7a81349bffddac1
Component: engine
 2015-12-01 11:59:45 +01:00
Vincent Demeester 4f7a986f9e Merge pull request #18198 from aditirajagopal/16756-docker_api_inspect_test 
Checkers on docker_api_inspect_test.go
Upstream-commit: 657085dfdb5ef789d07d0a3985aedbdeb4a1b4d9
Component: engine
 2015-12-01 09:56:01 +01:00
David Calavera 121cf6f1ca Make sure container start doesn't make the DNS fields nil. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d7117a1b713042096bd97815bbb9663a4a01c8af
Component: engine
 2015-11-30 22:46:31 -05:00
Jessica Frazelle 3bd7baa41a add licence to rpm 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 09d448f924aabf67ad476ce20539efa78a2715ca
Component: engine
 2015-11-30 15:19:31 -08:00
David Calavera 1f54cbf9d8 Merge pull request #18211 from Djelibeybi/master 
Updated LICENSE file
Upstream-commit: 94997e56a9a65ee651f759377be1f83f03693656
Component: engine
 2015-11-30 14:37:29 -08:00
Aditi Rajagopal 94a444216d Checkers on docker_api_inspect_test.go 
Applying #16756 to integration-cli/docker_api_inspect_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 85e5b05018a5b8095dc7390644829845794a56f7
Component: engine
 2015-11-30 16:23:46 -06:00
David Calavera 1003fb6c11 Merge pull request #18216 from aditirajagopal/16756-docker_api_containers_test 
Checkers on docker_api_containers_test
Upstream-commit: dc9f9d9445afe9dff091ff49259a622745a2f457
Component: engine
 2015-11-30 14:04:54 -08:00
Jessica Frazelle 4fd3238892 fix gopath when building debs 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 4935f7f500b8473ce53848e0c9673bac7a9fb522
Component: engine
 2015-11-30 13:44:59 -08:00
Aditi Rajagopal b034893275 Checkers on docker_api_containers_test 
Applying #16756 to integration-cli/docker_api_containers_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 4bdf957c26559d659af604dc6814a5cd2225a0f3
Component: engine
 2015-11-30 14:31:48 -06:00
David Calavera 57432b4d63 Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup 
Fix docker status incorrectly reports containerized
Upstream-commit: c84f5dfd7431dfef94a073b47f591515a58d9e00
Component: engine
 2015-11-30 11:47:16 -08:00
Phil Estes e285c73838 Merge pull request #18241 from LK4D4/remove_listenbuffer 
Remove listenbuffer
Upstream-commit: 2a354790a635537c2ed5325b6615e9bdccdc6954
Component: engine
 2015-11-30 14:37:14 -05:00
Jess Frazelle d6e4b2d7b7 Merge pull request #18178 from jfrazelle/apparmor-we-meet-again 
Fix docker-default profile handing signals
Upstream-commit: e852959fadf7ec77ffb57877806603b8c0bf523e
Component: engine
 2015-11-30 11:34:34 -08:00
David Calavera a6173bfeee Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test 
Checkers on integration-cli/docker_api_info_test
Upstream-commit: 54733abba337134b4de439182175a9ec51331c60
Component: engine
 2015-11-30 11:06:15 -08:00
Alexandre Beslic c21d72b21a Merge pull request #18204 from mavenugo/dhb 
Configurable discovery ttl and heartbeat timer
Upstream-commit: 0f0cf267e898f9a84533855304d542f524c814c1
Component: engine
 2015-11-30 11:00:53 -08:00
Jessica Frazelle d3dbad3a43 check version for docker-default aa profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f8db9a09e0ec9b1925839ffff4f1cc5fe3ace630
Component: engine
 2015-11-30 10:18:12 -08:00
David Calavera 0940f2e2b9 Merge pull request #18296 from jfrazelle/add-james 
add james golick to names generator
Upstream-commit: 221d979e7b6fbc1c631370a8d44bc588b68df543
Component: engine
 2015-11-30 10:00:21 -08:00
Jess Frazelle 45a6d40e9f Merge pull request #18303 from runcom/lxc-leftover 
daemon: remove sysInitPath, lxc leftover
Upstream-commit: 360a10651188fcf79b0110265c3f2723637e11b7
Component: engine
 2015-11-30 09:37:05 -08:00
Alexander Morozov 132ab17e74 Merge pull request #18239 from jfrazelle/17783-fix-regex 
Fix parsing of apparmor pcre syntax
Upstream-commit: 377e1d75f93101acbff7cf06df2c05a2df3b6760
Component: engine
 2015-11-30 09:15:25 -08:00
Alexander Morozov 3f8975aab8 Remove listenbuffer package 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a0251b2bbfe259c8d089e34415159f1b609779be
Component: engine
 2015-11-30 09:04:59 -08:00
Alexander Morozov 59911bba39 Remove usage of listenbuffer package 
It actually adds nothing to queuing requests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ca5795cef810c85f101eb0aa3efe3ec8d756490b
Component: engine
 2015-11-30 09:04:55 -08:00
Vincent Demeester fd34041b28 Merge pull request #18306 from runcom/add-test-suffix 
integration-cli: add _test suffix to test file
Upstream-commit: 7bef4281103035373d97d5807893aafc81f21735
Component: engine
 2015-11-30 17:02:15 +01:00
Vincent Batts 21928a9bde Merge pull request #18226 from duglin/Issue18170 
Fix for zero-sized layers
Upstream-commit: a26accfb5d52f81b6df339da36855b85d3a473fe
Component: engine
 2015-11-30 09:57:37 -06:00
Phil Estes 3820fd0625 Merge pull request #18272 from hqhq/hq_fix_kernel_memory 
Fix kernel memory limit
Upstream-commit: f3ff09f5786fc74161b13ebb48299d07bb0847d2
Component: engine
 2015-11-30 10:01:45 -05:00
Antonio Murdaca 14bb39d0a2 integration-cli: add _test suffix to test file 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1f0f41e8d7511999faad79866e2799f78956bb37
Component: engine
 2015-11-30 11:33:57 +01:00
Antonio Murdaca c116892cdb daemon: remove sysInitPath, lxc leftover 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1b726b29b21bbc1aebfe0f6b71dfd61145bdd6af
Component: engine
 2015-11-30 10:04:13 +01:00
Zhang Wei cd510fc600 Golint auto-generated file 
Fix auto-generation script to golint auto-generated files.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: a7b73e57bc55ff63ccbe3a9ff879a25253292c9b
Component: engine
 2015-11-30 16:34:07 +08:00
Qiang Huang 54560bdc1f Update cgroup integration tests 
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 0a426c47c84cb8aec714cce2c21e6c6696cbc8c4
Component: engine
 2015-11-30 08:40:47 +08:00
Jessica Frazelle bbfa3215a0 add james golick to names generator 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: bf66deeb080787c3bda9aa619d3cdb22c68bbee1
Component: engine
 2015-11-29 10:40:12 -08:00
Qiang Huang dfeea039e6 Fix kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: dd7b4fd651a6f9354efb991f6ce547a03729fa18
Component: engine
 2015-11-28 09:47:25 +08:00
Antonio Murdaca 873d694f0a integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s) 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 4c3c3fedf81a47f9da1a92665ae53e81ce30db62
Component: engine
 2015-11-27 17:10:09 +01:00
Antonio Murdaca e754309ce0 Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test 
Checkers on docker_cli_pull_local_test.go
Upstream-commit: a415b0c2208bd426df731491fe6e4714156f3527
Component: engine
 2015-11-27 17:04:28 +01:00
Alexander Morozov c3cf7195f6 Merge pull request #17108 from coolljt0725/fix_remove_image 
Fix docker rmi trying to remove a being used parent
Upstream-commit: b8c21783f0c7915779de3fa487f233ebc145738d
Component: engine
 2015-11-26 12:21:30 -08:00
Alexander Morozov cb358947f2 Merge pull request #18232 from mqliang/defer 
move defer statement for readability
Upstream-commit: 88aca3610fecdf790c4604ed705d31f8d17ef8e6
Component: engine
 2015-11-26 12:20:55 -08:00
Antonio Murdaca c93754a0f9 vendor: bump deps 
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
 2015-11-26 16:29:59 +01:00
Vincent Demeester 689c530381 Merge pull request #18262 from runcom/add-line 
hack: make: .go-autogen: add blank line after build tag
Upstream-commit: 2adeef9d1d4a0cf1fb6b0d56dc246008d72f777e
Component: engine
 2015-11-26 16:03:23 +01:00
Antonio Murdaca af5191b5dd hack: make: .go-autogen: add blank line after build tag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: a1733c6575339e254f2b49625d597f46f883fe42
Component: engine
 2015-11-26 13:16:39 +01:00
Sebastiaan van Stijn 1cdb10c9d0 Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
Upstream-commit: 9be2eea41593db2e6203097592e9347bb40c5637
Component: engine
 2015-11-26 13:12:41 +01:00
Arnaud Porterie b13551acbe Merge pull request #18220 from mqliang/temvarible 
remove unnecessary temporary variable
Upstream-commit: bb11900393df21002a7608c007c90438522be7dd
Component: engine
 2015-11-26 11:40:02 +01:00
Sven Dowideit 97d5f4d62b Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ce5177cf4b175435a667aeced586f653a9203790
Component: engine
 2015-11-26 20:20:46 +10:00
Brian Goff 72a5c00834 Merge pull request #18252 from aaronlehmann/tarstream-readcloser 
Make TarStream return an io.ReadCloser
Upstream-commit: 9ebf7dfae324d8fad524c9578ed850bf3b116d32
Component: engine
 2015-11-25 21:35:21 -05:00
mqliang e8167fa92b remove unnecessary temporary variable 
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: 478b773fe5aa7b9bdfc571d3e8f8bc3bc47826ea
Component: engine
 2015-11-26 10:25:55 +08:00
Doug Davis a047f4a27c Fix for zero-sized layers 
Moved a defer up to a better spot.

Fixed TestUntarPathWithInvalidDest to actually fail for the right reason

Closes #18170

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7bb9fc415ac50abf5f754005264bfe152eeca7d6
Component: engine
 2015-11-25 18:02:03 -08:00
Lei Jitang 2d14ff7cb5 Fix docker rmi trying to remove a being used parent 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0bbc9f1d2d0effcf33d82d24bbf97f30b90619de
Component: engine
 2015-11-26 09:57:20 +08:00