toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,196 Commits 3 Branches 295 Tags
eb6bec8a3c421c8377980f58c4c2eca32030dcf1
Commit Graph
14196 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Anderson cc2fb5cc3f Update docs around private github submodules in automated builds. 
Signed-off-by: Jeff Anderson <jeff@docker.com>
Upstream-commit: 390dd4bf3f6e3c6b239d597467554a19b04dc89d
Component: engine
 2015-03-19 10:01:43 -06:00
J. Nunn 627077c4f9 Typo/grammar corrections to dockerizing.md 
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
 2015-03-19 10:51:12 -05:00
Alexander Morozov 22d9cf2b19 Merge pull request #11459 from simonswine/10001-ipv6-tests 
[WiP] Adds testing for bridge's IPv6 support
Upstream-commit: d338c613bf7c9dc7e77bebf104ba83f69aaeb8a7
Component: engine
 2015-03-19 08:37:28 -07:00
Phil Estes 7b57ca682e We should point README readers at the new registry v2 project 
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: b4ebcdef155d2c517192a07ddfa80e163d78b1b1
Component: engine
 2015-03-19 11:11:51 -04:00
falmp a94170b2cb Fixed --read-only description indentation 
The wrong indentation was breaking documentation layout with code blocks.

Signed-off-by: Francisco Lopes <chico.lopes@gmail.com>
Upstream-commit: b311066d240e6f034c8a5749f01897739f26c7bb
Component: engine
 2015-03-19 11:53:50 -03:00
Tibor Vass 2bcbb3285b Merge pull request #11274 from MabinGo/selinux_enable_verify 
Add logs when Docker enabled selinux (closes #11197)
Upstream-commit: fdf49d758f6f93d04077ad0c82a7fd7312b2ffdc
Component: engine
 2015-03-19 10:34:55 -04:00
Phil Estes 1d92cf5680 Merge pull request #11453 from duglin/HideDaemonDots 
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
 2015-03-19 10:10:18 -04:00
Phil Estes 5e77b6e481 Merge pull request #11455 from tianon/minor-formatting-consistency 
Fix several very minor consistency issues
Upstream-commit: ae1d3d6d6851c2721bae94f0c7c0c0af9b866392
Component: engine
 2015-03-19 09:57:57 -04:00
Michal Fojtik 825ed262fe Fix lxc-start in lxc>1.1.0 where containers start daemonized by default 
Signed-off-by: Michal Fojtik <mfojtik@redhat.com>
Upstream-commit: d62f25e4220d1d1ca792adf9c7423ee60a00c0d7
Component: engine
 2015-03-19 14:51:05 +01:00
Phil Estes 6061dc16e1 Merge pull request #11496 from docker/revert-11495-m3 
Revert "correct comment errors for netlink_linux.go"
Upstream-commit: 27fd77cc3be15208071029e4659f67163a44574e
Component: engine
 2015-03-19 09:38:25 -04:00
unclejack eec8373c1c Revert "correct comment errors for netlink_linux.go" 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: d173669fdff8ec1acc33d2da28e2a473a3844e56
Component: engine
 2015-03-19 14:38:00 +02:00
Doug Davis 0b3e883c9e Merge pull request #11495 from sunyuan3/m3 
correct comment errors for netlink_linux.go
Upstream-commit: 70092e5ebbb0afe9ce6b125643265541298309fe
Component: engine
 2015-03-19 08:29:54 -04:00
s00318865 d2b7fa6417 correct comment errors for netlink_linux.go 
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: c5fdc93f89db3cb3ea4489999296487fad0f440d
Component: engine
 2015-03-19 20:29:30 +08:00
s00318865 aa7fb83cec add TestContainerRestartwithGoodContainer test case 
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: 133983190622bf2618df6c36fb77669e30458e17
Component: engine
 2015-03-19 20:20:04 +08:00
Lei Jitang f2ad0ab09b Fix hostname missing when a container's net mode is contaienr mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 74664dabff906f42b9acfbad516eeae484b47af9
Component: engine
 2015-03-19 17:03:40 +08:00
Johan Euphrosine 35418ac64f CONTRIBUTING.md: fix markdown formating 
Signed-off-by: Johan Euphrosine <proppy@google.com>
Upstream-commit: 1d9fb2583cd85261f0813edcf5d3ddf89fefc397
Component: engine
 2015-03-19 01:51:45 -07:00
Harald Albers 07ba863c0f Remove 'name' filter from docker events documentation 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
 2015-03-19 08:51:36 +01:00
Michael Crosby 27ea0d1653 Merge pull request #11488 from stevvooe/address-digest-deadlock 
Correctly close pipe after error in tarsum verification
Upstream-commit: c861231a70342472ad9322320bf6fb62e6afba35
Component: engine
 2015-03-18 23:00:13 -07:00
James Turnbull a7ed4dc483 Merge pull request #11028 from jstangroome/patch-1 
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
 2015-03-19 01:44:43 -04:00
Vishnu Kannan b21852214d Adding integration tests for --cgroup-parent feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
 2015-03-19 02:34:42 +00:00
Vishnu Kannan 8bcedc4b44 Adding documentation for '--cgroup-parent' option. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
 2015-03-19 02:34:15 +00:00
Vishnu Kannan 1f50057df8 Adding '--cgroup-parent' flag to docker run. This feature helps users implement more complex 
resource isolation policies on top of what native docker provides.

Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 0b1e2b5a553565e99afd7ceda36beab098f506d0
Component: engine
 2015-03-19 02:34:15 +00:00
Stephen J Day b16d50a307 Correctly close pipe after error in tarsum verification 
This addresses a subtle deadlock where an error during a copy prevented pipe
closure to propagate correctly. By closing down the read end of the pipe rather
than the write end, the waiting writer is properly signaled. A nice side-effect
of this change is that errors encountered by io.Copy are now propagated to the
verifier's Write method.

A test to ensure validation errors for unsupported digest types has been added,
as well.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 0306a41909175b467d08ebc97d4c5136ca9e7ebd
Component: engine
 2015-03-18 19:07:55 -07:00
Mabin ccb5c44c68 Add logs when Docker enabled selinux 
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 1bf529a45674dc07de6efba806b854f63f3dc0bf
Component: engine
 2015-03-19 09:46:53 +08:00
Doug Davis 793cdf14d1 Merge pull request #11410 from cpuguy83/10191_build_resources 
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
 2015-03-18 21:44:21 -04:00
Brian Goff 5e80a64076 Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
 2015-03-18 20:57:13 -04:00
moxiegirl 30161bd9a1 Merge pull request #11452 from jeffdm/master 
Adding Kitematic link to Mac OS X install instructions in docs
Upstream-commit: 068d343ddfad23ca2f7b407f5be03803029ac311
Component: engine
 2015-03-18 17:32:48 -07:00
Jeffrey Morgan 545bbe667a Adding Kitematic link to Mac OS X install instructions 
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
 2015-03-18 16:32:59 -07:00
Jessie Frazelle a0dccb769e Merge pull request #11328 from jfrazelle/fix-docs-release-script 
Fix clear cache docs release.
Upstream-commit: 42f5c874254798c2e2bc8060939e48ade5c97e23
Component: engine
 2015-03-18 16:06:27 -07:00
Tibor Vass 47d9382364 Merge pull request #11430 from jfrazelle/export_outputflag 
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
 2015-03-18 19:04:43 -04:00
Jessie Frazelle 7ce99f1b4f Merge pull request #11471 from LK4D4/wait_for_copier 
Wait for copier finishing it's work before closing logger
Upstream-commit: 474f58e2e73de477e6b9a827e100f3f22f52048a
Component: engine
 2015-03-18 15:41:12 -07:00
Derek McGowan 5c07713134 Update auth client configuration to use proper tls config 
Currently the http clients used by auth use the default tls config.  The config needs to be updated to only support TLS1.0 and newer as well as respect registry insecure configuration.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 959b35d9741e0478209445fa5960d50346cd4ca6
Component: engine
 2015-03-18 14:52:49 -07:00
Jessie Frazelle 6d9a5811c0 Merge pull request #11474 from crosbymichael/null-masked-paths 
Do not mask /proc/kcore in privileged
Upstream-commit: e1a0bff6b8aefdea341d01a75a0c7e9235cda421
Component: engine
 2015-03-18 14:43:13 -07:00
Phil Estes 9bbf5e7c87 Merge pull request #11472 from LK4D4/logger_mutex 
Protect jsonfilelog writes with mutex
Upstream-commit: 54232084c59b0356141f5630beafdfc2d58970e9
Component: engine
 2015-03-18 17:20:03 -04:00
Michael Crosby dc45397f85 Do not mask /proc/kcore in privileged 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f4a458e67f9cedae9167cc70d15fd8bbe942f880
Component: engine
 2015-03-18 14:17:21 -07:00
Tibor Vass e9cf3bba10 Merge pull request #11271 from dmcgowan/v2-sha256 
Push and pull to v2 registries with sha256 instead of tarsum
Upstream-commit: d0e5f52fbb1eab460e127e64629a2a26f9bc4a83
Component: engine
 2015-03-18 16:53:47 -04:00
Jessie Frazelle 803adf7842 Merge pull request #11464 from ncdc/fix-duplicate-dangling-images 
Fix duplicate display of dangling images
Upstream-commit: 29f809233e58547389da040859a8c286288c4d8a
Component: engine
 2015-03-18 13:53:33 -07:00
Alexander Morozov 783795eacd Wait for copier finishing it's work before closing logger 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b6a42673abb8c2df5920343b9144a4ce422b2d50
Component: engine
 2015-03-18 13:48:01 -07:00
Sachin Joshi 9bfef356fa Fix panic with vi in busybox 
Following bugs are fixed:
1.Handle out of bound cursor movements: vi in busybox sets cursor
to (999,999) expecting it to be set to right, bottom correctly.

2.Correctly determine redirected non-terminal file.

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: cb7a65c55e192558376e542319a4b7e5445c2bcf
Component: engine
 2015-03-18 13:10:57 -07:00
Alexander Morozov 4af8cc6694 Protect jsonfilelog writes with mutex 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bd8661e8fafd5f80ce12fa966b9f8e990b7d7714
Component: engine
 2015-03-18 13:00:53 -07:00
unclejack c6028dad54 pkg/ioutils: avoid huge Buffer growth in bufreader 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e5ea2b235720db8dec7689b410de1830f707284a
Component: engine
 2015-03-18 19:51:55 +02:00
unclejack b9849b445a pkg/ioutils: add tests for BufReader 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 028f7987fe455d958d08db98ae267d9fd4cf3813
Component: engine
 2015-03-18 19:32:46 +02:00
Harald Albers 9789e9f83c restrict bash completion for hostdir arg to directories 
The previous state assumed that the HOSTPATH argument referred to a
file. As clarified by moxiegirl in PR #11305, it is a directory.
Adjusted completion to reflect this.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 418b7a9abbb31c4aa226931edfaa626f251cc00c
Component: engine
 2015-03-18 18:10:58 +01:00
moxiegirl ea8c209cf2 Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144 
Clarify behavior of docker cp
Upstream-commit: 50bf3cbedc923985868bd84515460aad174dcccb
Component: engine
 2015-03-18 08:46:52 -07:00
Andy Goldstein f8293aa682 Fix duplicate display of dangling images 
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: c680dd9e5adfe7255ac4499bff26bbb6edf7fe78
Component: engine
 2015-03-18 10:41:01 -04:00
Doug Davis c30f3dbe16 Merge pull request #11314 from HammerOfThor/pull_err_print 
print detailed error info for docker pull
Upstream-commit: 9732c254ad6eba3a1707f5b45b9023e672ca8613
Component: engine
 2015-03-18 08:08:01 -04:00
Christian Simon 005b71267c [WiP] Adds testing for bridge's IPv6 support 
* fixes #10001
* test for global subnets <= 80
* test for global subnets > 80
* test link local allocations
* test duplicated addresses
* test regression from bug #11427

Signed-off-by: Christian Simon <simon@swine.de>
Upstream-commit: 4307ec283b817997bdcf989767a99d57f7361b9f
Component: engine
 2015-03-18 08:51:14 +01:00
Tianon Gravi 92a488b33b Fail explicitly if curl is missing in contrib/download-frozen-image.sh 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: b5763f8fa7309f95e21271fca99d0a71c05d0fef
Component: engine
 2015-03-17 23:10:02 -06:00
Tianon Gravi ef14748f1d Fix several very minor consistency issues 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: ae61593417bd9bcf3d862f79271c7d5b83c1e6d5
Component: engine
 2015-03-17 23:01:40 -06:00
Zhang Wei 9817390387 print detailed error info for docker pull 
When docker push get response with unknown HTTP status, docker daemon
print:
"Error: Status XXX trying to push repository XXX: XXX"
But when docker pull meets response with unknown status code, it gives:
"HTTP code: XXX"

This commit helps docker pull print more detailed error info like push
does, so push and pull can behave consistently when error happens.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: efa65d16b6e0b835c1786a47140c974e5c0f71cb
Component: engine
 2015-03-18 11:35:44 +08:00