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
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
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
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
dc3c53ce55
Merge pull request #11450 from crosbymichael/rlimitfix
...
Don't hardcode default rlimit
Upstream-commit: cf071bb9620cc36ab446c467a332a7c287856726
Component: engine
2015-03-17 20:27:05 -07:00
883ebf04a4
Merge pull request #11320 from estesp/fix-daemon-startup
...
Fix daemon shutdown on error after rework of daemon startup
Upstream-commit: a5269223a78d963774b12359a1e505b10fa9ac81
Component: engine
2015-03-17 19:04:25 -07:00
b6b5f87d20
Don't hardcode default rlimit
...
The default for rlimit handling should be to inherit the rlimit of the
daemon unless explicitly set.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f5a154f2d2b2bea5054ae35314d15021a8bf8ae4
Component: engine
2015-03-17 16:04:15 -07:00
00afc52ed0
Merge pull request #11237 from thaJeztah/docs-remove-temporary-styles
...
cleanup: docs: remove temporary inline styles
Upstream-commit: ef78cc01916da2dc77811c67864dd65f225b7452
Component: engine
2015-03-17 15:09:17 -07:00
d74344f45f
Merge pull request #11431 from jfrazelle/update-docs-image-on-make
...
Update docs/base in makefile docs-build.
Upstream-commit: 8e6d0107df333c29f736e69442a81ed001a41073
Component: engine
2015-03-17 14:49:24 -07:00
b486ed31bd
cleanup: docs: remove temporary inline styles
...
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868 ).
This removes those temporary `<style>` tags.
depends on #11230 (https://github.com/docker/docker/issues/11230 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 4e6a01023b7422dc3df7f02e248bb06361069fcc
Component: engine
2015-03-17 22:48:28 +01:00
081bc20c46
Merge pull request #11448 from vishh/port_log
...
Reduce logging level for "ip_local_port_range" proc file in not accessible.
Upstream-commit: f42acd070afeefd630952c69fafa58f0121797fb
Component: engine
2015-03-17 14:52:23 -04:00
26ddd6db93
Fix daemon shutdown on error after rework of daemon startup
...
Currently the daemon will not stop on error because the serve API job is
blocking the channel wait for daemon init. A better way is to run the
blocking serve API job as a goroutine and make sure that error
notification gets back to the main daemon thread (using the already
existing channel) so that clean shutdown can occur on error.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 459e58ffc9bff8206a860fb63f973e4f07129756
Component: engine
2015-03-17 14:15:00 -04:00
1816ded115
Merge pull request #11355 from moxiegirl/11023-ubuntu-install
...
Updating Ubuntu installation to use wget; eliminating elo
Upstream-commit: c1639a7e4e4667e25dd8c39eeccb30b8c8fc6357
Component: engine
2015-03-17 14:11:27 -04:00
28753b690d
Merge pull request #11298 from brahmaroutu/gccgo_script
...
Initial gccgo build script, requires host to contain gccgo 5.0
Upstream-commit: e35c78a4954c2d8b1c3963d3190ab3cfd3a48342
Component: engine
2015-03-17 13:45:47 -04:00
8da4d5374d
Reduce logging level from error to warning if "/proc/sys/net/ipv4/ip_local_port_range" proc file in not accessible.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: 39d49ba7ba21f204f5fc174aaf319ed1cdad790f
Component: engine
2015-03-17 17:39:17 +00:00
b2a50dead1
Merge pull request #11444 from albers/bash-completion
...
Updates to bash completion
Upstream-commit: c858cbffe06897966033dab9af31f877af4d2f47
Component: engine
2015-03-17 10:25:46 -07:00
cf394b41e4
# This is a combination of 2 commits.
...
# The first commit's message is:
Updating Ubuntu installation to use wget; eliminating elo
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
# This is the 2nd commit message:
Adding in James comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
2015-03-17 10:15:46 -07:00
b221b456d5
Merge pull request #11447 from moxiegirl/black-to-back-fixes
...
Fixing it back
Upstream-commit: ed6685369740035b0af9675bf9add52d0af7657b
Component: engine
2015-03-17 13:09:16 -04:00
176e29d9be
Fixing it back
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 241579a34faed177100f407465a6ae47bb5b98d2
Component: engine
2015-03-17 10:07:09 -07:00
d3fdbf9469
Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882
...
Return of the Ring: Metadata Labels Doc Tweaks
Upstream-commit: 2ab105e9fe604bb709dfaf25a19f4af003a8ddad
Component: engine
2015-03-17 09:47:36 -07:00
90fc12f567
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
Upstream-commit: 1ff5a91007f01d2d61a7b2066db2e164085f0d1b
Component: engine
2015-03-17 09:45:58 -07:00
79bbb9fdbf
Merge pull request #11118 from shishir-a412ed/restriction_username_length
...
Docker Tag command: Relax the restriction on namespace (username) length from 30 to 255 characters.
Upstream-commit: a751cc53a751435df516d07a5e85e5f591e63345
Component: engine
2015-03-17 09:41:12 -07:00
25f628ce87
Updates to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 04ca2c1f2bcf9251689dc346baed6715fb99fb0e
Component: engine
2015-03-17 17:07:10 +01:00
e296e8dc09
Merge pull request #11369 from coolljt0725/fix_link
...
Fix --link to a container which net mode is container
Upstream-commit: cb77ad4757947adcff7bf4cd95969e75a7018614
Component: engine
2015-03-17 08:36:33 -07:00
987dfc1c4c
Merge pull request #11401 from Mashimiao/11385-fix-lxc-conf-error
...
fix not show error when using --lxc-conf without lxc driver
Upstream-commit: 8685af0b132f2b0a6ee79a4d9491e0d0496fa25c
Component: engine
2015-03-17 08:35:18 -07:00
2b10322f3f
Merge pull request #11436 from sunyuan3/m1
...
verify MaximumRetryCount for container restart policy
Upstream-commit: aba193499e06341428b15f99149c00682507bbb2
Component: engine
2015-03-17 08:26:22 -07:00
bf4dc2f5f6
Merge pull request #11109 from ncdc/pull-by-digest
...
Add support for referring to images by digest
Upstream-commit: 0c3c645ad7ffbf5b932817b05bbc7203723fbba7
Component: engine
2015-03-17 08:15:45 -07:00
9e124c2aad
Fix --link to a container which net mode is container mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 82e2e1a11af60a41100e2ced24f23cf2872e5604
Component: engine
2015-03-17 07:50:12 -07:00
d6d379e87a
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
2015-03-17 10:10:42 +00:00
7534044791
Merge pull request #11437 from duglin/FixLabels
...
Some fixes for new LABEL stuff
Upstream-commit: ad56b5c603b504e601c992d299ff2bbac133b520
Component: engine
2015-03-16 23:39:59 -07:00
ad61919ab6
Some fixed for new LABEL stuff
...
- command.Commands was missing "Label"
- used the correct error string in dispatcher when LABEL has no args, otherwise
the test TestBuildMissingArgs will not work
- removed the premature error msg in line_parser that was blocking the
label() func in dispatcher from showing the err msg in previous bullet
- since LABEL uses the env parser it needs to be added to the replaceEnvAllowed
list so that proper quote processing will be done. Especially once
PR #10431 is merged.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6784a772baaa20936f00b8adc00a4b4444356181
Component: engine
2015-03-16 22:53:41 -07:00
3f595d22d6
verify MaximumRetryCount for container restart policy
...
Signed-off-by: s00318865 <sunyuan3@huawei.com >
Upstream-commit: 173642c8660adb39619ecfe725bd44b984d4c627
Component: engine
2015-03-17 13:20:25 +08:00
43ac3e6d56
Updating with Sven's comments and other tweaks
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6ddfe883dd0d6ce1f97a121652927ac1b1dbaefe
Component: engine
2015-03-16 21:49:33 -07:00
5f00f97ea0
Merge pull request #9882 from ibuildthecloud/labels
...
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
85e9896dd8
Merge pull request #10860 from mbentley/curl-install-fix
...
Add 'extras' virtual package to fix kernel upgrade fallback from aufs to devicemapper
Upstream-commit: ea25582d9f2c74a3e39f18bfd1a33426b4163e66
Component: engine
2015-03-16 18:21:11 -07:00
6b3727b132
Merge pull request #11429 from tianon/eval-shellinit
...
Add "eval" to every invocation of "boot2docker shellinit"
Upstream-commit: 97a5c584b3c917a5877012b2d4c1a00e5bb32479
Component: engine
2015-03-16 21:19:50 -04:00
9d08a2eb1e
Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference
...
docs: use more tables in run reference and minor fixups
Upstream-commit: da24ba42e2717bb5d8765c8ba42cd4aeaa7a8ec6
Component: engine
2015-03-16 18:02:42 -07:00
2b2155313c
Update docs/base in makefile docs-build.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 6c492a2d05cc59d79d03c2015b8ed8140d44b343
Component: engine
2015-03-16 17:53:54 -07:00
97d21480be
fix not show error when using --lxc-conf without lxc driver
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 703cab12e77189432e160772f67e5f131fd14baa
Component: engine
2015-03-17 08:50:17 +08:00
873a2edf47
Merge pull request #11210 from xuhdev/patch-1
...
Update doc: "docker create" must specify a command
Upstream-commit: e6b18cb66d88e7b4f3762e74ee963c984185df33
Component: engine
2015-03-16 17:43:17 -07:00
1211b3d022
Add "eval" to every invocation of "boot2docker shellinit"
...
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 200123b317cd1bad052d3c503278d03d712e4812
Component: engine
2015-03-16 18:27:59 -06:00
dfdd70de33
Merge pull request #11203 from rhatdan/Dockerfile
...
We had some testers who found a hard to diagnose bug in Dockerfile
Upstream-commit: f4f10cf43ba1298284dcab926b2594bafda1087a
Component: engine
2015-03-16 17:26:18 -07:00
df4aae20f1
Merge pull request #10723 from SvenDowideit/takeover-10653
...
Update sample systemd for container
Upstream-commit: 44e9715e46db46d9c88b5bba6072c0fe42aa5837
Component: engine
2015-03-16 17:18:57 -07:00
1bcf6f53fe
Merge pull request #10816 from SvenDowideit/docker-build-return-code
...
Add some information about the docker build return code
Upstream-commit: c7f5ee9d695f336ad2c273ceebdf2fe3257f673f
Component: engine
2015-03-16 17:18:26 -07:00
845f59abb0
Documentation changes for labels
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: fae92d5f0a1d81a48dc210d5ae28ef83c724b5ac
Component: engine
2015-03-16 17:08:40 -07:00
9596e6f457
Merge pull request #11353 from mrunalp/override_default_mounts
...
Filter out default mounts that are being overriden by the user.
Upstream-commit: 87a8658eb625d25d4d72bf65efc5629be4c99d40
Component: engine
2015-03-16 16:40:32 -07:00
2b824bffa5
Merge pull request #11332 from icecrime/windows_release
...
Publish Windows binaries in release script
Upstream-commit: 9422bc55fafbf0a084090398560ca4fcd6235919
Component: engine
2015-03-16 16:39:58 -07:00
1820b54f91
Merge pull request #11427 from LK4D4/fix_alloc_ip6
...
Fix IPv6 autoallocation from mac with --ipv6-cidr
Upstream-commit: 213be9ee2761828f56c7308bd85e4ca9fd33e34a
Component: engine
2015-03-16 16:38:46 -07:00
c470ea400e
Merge pull request #11426 from dmcgowan/registry-error-cleanup
...
Quote registry error strings
Upstream-commit: d70c5cdcb90832a4b5e361d6fcaf374bcf3c135f
Component: engine
2015-03-16 19:27:41 -04:00
c03919b68e
Merge pull request #11411 from icecrime/contributing_squash
...
Detail CONTRIBUTING.md regarding squashing
Upstream-commit: c0b48ab70e0cc34a78e58a16871426f40a2fef72
Component: engine
2015-03-16 16:25:54 -07:00
