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
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
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
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
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
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
7a404617a3
Merge pull request #11402 from miminar/err-cleanup
...
Error formatting cleanups
Upstream-commit: 88f437d6c619f7b07a22cb5750814bce4d8d7164
Component: engine
2015-03-16 16:13:16 -07:00
046de93bdf
Merge pull request #11416 from mrunalp/update_libcontainer
...
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
Upstream-commit: 8a6a5929a3164fb3fd6a6bc017d738763ff60ce7
Component: engine
2015-03-16 15:51:58 -07:00
16dea9ca51
Publish Windows binaries in release script
...
Windows client being official supported, publish Docker client Windows
binaries as part of the release.sh script.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 241c37197643a2495adbca8985c6399dba52a370
Component: engine
2015-03-16 15:49:38 -07:00
9b00b0ac0c
Filter out default mounts that are override by user.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 7804cd36eec45c184dcabdbcb52033c1c0179c03
Component: engine
2015-03-16 18:39:50 -04:00
9b365ee3c9
Build docker with gccgo, requires host to contain gccgo 5.0
...
Addresses #9207
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ec92e84b85bafaa00867bcb6515062bae773e8da
Component: engine
2015-03-16 22:38:26 +00:00
aeed74c156
Fix IPv6 autoallocation from mac with --ipv6-cidr
...
We used slice globalIPv6Network.IP itself, not its copy as expected.
Fixes #10774
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 491f8ab14493babb1c06e240c7a9de64f34827a0
Component: engine
2015-03-16 15:36:50 -07:00
272713f665
Quote registry error strings
...
Currently when registry error strings contain new line characters only the last line is displayed to the client. Quote the string to ensure the client can see the entire body value.
fixes #11346
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 33c94eb23857f23fb91899b77ba8615c4e6bdadf
Component: engine
2015-03-16 15:32:47 -07:00
bd0b1983fb
Merge pull request #11343 from hqhq/hq_fix_panic_error
...
fix panic error when docker stats a stopped container
Upstream-commit: a2fcae41efdc52087d733d962b9ee3ef37a81450
Component: engine
2015-03-16 15:16:03 -07:00
ca91611c4f
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
...
It includes fixes to selinux Getfilecon, mounting sysfs and cgroups.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Upstream-commit: 591f821aee9e1d59ec3c619e15344c90047463d6
Component: engine
2015-03-16 18:13:40 -04:00
f07bd027b7
Define 'logical unit of work'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 68a9cd63cc4ca3c898388fe814a2dd8b7fca385e
Component: engine
2015-03-16 15:09:40 -07:00
afaf27b603
Merge pull request #11424 from dmcgowan/registry-ping-user-agent
...
Use request factory for registry ping
Upstream-commit: 9611b6470843c2ec616978e14bc73e9e27260c0f
Component: engine
2015-03-16 15:02:53 -07:00
f6d69b904a
Merge pull request #11420 from estesp/reexec-path-fix
...
Fix relative path execution of docker daemon in reexec.Self()
Upstream-commit: f41ba82eb97379948aa88eb80eefd7a96c37e1ec
Component: engine
2015-03-16 14:57:25 -07:00
526e8c6e31
Merge pull request #10591 from duglin/ErrUnknownCmd
...
Generate an error on unknown Dockerfile instruction
Upstream-commit: 085054db9d8850a7d2c8658bb9a7fdacf7a3ceb8
Component: engine
2015-03-16 17:47:28 -04:00
194d87a1e1
Merge pull request #10792 from larsks/bug/10781
...
fix various problems with iptables.Exists
Upstream-commit: 1705ded1d208673ebd1a5fcc61a324da5f30411d
Component: engine
2015-03-16 17:39:36 -04:00
eda2d7f6c9
Merge pull request #11419 from dmcgowan/fix-test-pull-verified
...
Fix test pull verified
Upstream-commit: 2550c306eb737c75f331454fa372bc5700b566f4
Component: engine
2015-03-16 14:23:59 -07:00
1fae595274
Use request factory for registry ping
...
Currently when the registry ping is sent, it creates the request directly from http.NewRequest instead of from the http request factory. The request factory adds useful header information such as user agent which is needed by the registry.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 55f0ca94e57fc8ec26a79061d04ddd3aeaecb94b
Component: engine
2015-03-16 14:21:00 -07:00
00d90da424
Merge pull request #11295 from LK4D4/oom_after_dead
...
Check oom status after container stopped in lxc driver
Upstream-commit: 0c2eb5ebfb118e1fcab84a8eb70dc8aee5a618ad
Component: engine
2015-03-16 14:16:47 -07:00
2781401caa
fix various problems with iptables.Exists
...
This modifies iptables.Exists so that it must be called with an explicit
table and chain. This allows us (a) to generate an appropriate command
line for "iptables -C", which was not previously possible, and (b) it
allows us to limit our strings.Contains() search to just the table and
chain in question, preventing erroneous matches against unrelated rules.
Resolves #10781
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
Upstream-commit: 3559b4177e611920d87c4dae607c641efb645783
Component: engine
2015-03-16 17:14:45 -04:00
a3cbef74ae
Merge pull request #11364 from Mashimiao/update-manpage
...
Update docker manpage
Upstream-commit: 61e7efeadd3af1d9cf666866940d999ae7fd450b
Component: engine
2015-03-16 14:13:27 -07:00
