213be9ee27
Merge pull request #11427 from LK4D4/fix_alloc_ip6
...
Fix IPv6 autoallocation from mac with --ipv6-cidr
2015-03-16 16:38:46 -07:00
d70c5cdcb9
Merge pull request #11426 from dmcgowan/registry-error-cleanup
...
Quote registry error strings
2015-03-16 19:27:41 -04:00
c0b48ab70e
Merge pull request #11411 from icecrime/contributing_squash
...
Detail CONTRIBUTING.md regarding squashing
2015-03-16 16:25:54 -07:00
88f437d6c6
Merge pull request #11402 from miminar/err-cleanup
...
Error formatting cleanups
2015-03-16 16:13:16 -07:00
8a6a5929a3
Merge pull request #11416 from mrunalp/update_libcontainer
...
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
2015-03-16 15:51:58 -07:00
491f8ab144
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>
2015-03-16 15:36:50 -07:00
33c94eb238
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)
2015-03-16 15:32:47 -07:00
a2fcae41ef
Merge pull request #11343 from hqhq/hq_fix_panic_error
...
fix panic error when docker stats a stopped container
2015-03-16 15:16:03 -07:00
591f821aee
Update libcontainer to 52a8c004ca94cf98f6866536de828c71eb42d1ec
...
It includes fixes to selinux Getfilecon, mounting sysfs and cgroups.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-03-16 18:13:40 -04:00
68a9cd63cc
Define 'logical unit of work'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-16 15:09:40 -07:00
9611b64708
Merge pull request #11424 from dmcgowan/registry-ping-user-agent
...
Use request factory for registry ping
2015-03-16 15:02:53 -07:00
f41ba82eb9
Merge pull request #11420 from estesp/reexec-path-fix
...
Fix relative path execution of docker daemon in reexec.Self()
2015-03-16 14:57:25 -07:00
085054db9d
Merge pull request #10591 from duglin/ErrUnknownCmd
...
Generate an error on unknown Dockerfile instruction
2015-03-16 17:47:28 -04:00
1705ded1d2
Merge pull request #10792 from larsks/bug/10781
...
fix various problems with iptables.Exists
2015-03-16 17:39:36 -04:00
2550c306eb
Merge pull request #11419 from dmcgowan/fix-test-pull-verified
...
Fix test pull verified
2015-03-16 14:23:59 -07:00
55f0ca94e5
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)
2015-03-16 14:21:00 -07:00
0c2eb5ebfb
Merge pull request #11295 from LK4D4/oom_after_dead
...
Check oom status after container stopped in lxc driver
2015-03-16 14:16:47 -07:00
3559b4177e
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>
2015-03-16 17:14:45 -04:00
61e7efeadd
Merge pull request #11364 from Mashimiao/update-manpage
...
Update docker manpage
2015-03-16 14:13:27 -07:00
66bf7a269a
Merge pull request #11300 from Microsoft/10662_jjh_server_factor_serverfd_and_systemd_for_windows
...
Factor out ServeFD & systemd in server for Linux only (Not Windows)
2015-03-16 14:12:48 -07:00
334aea3441
Fix relative path execution of docker daemon in reexec.Self()
...
After the new libcontainer API, the reexec.Self() output of the daemon
binary is used as the libcontainer factory InitPath. If it is relative,
it can't be found at container start time. This patch solves the
problem by making sure that we return a rooted/absolute path if a
relative path is used.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-16 16:52:00 -04:00
793ebba3d6
Enforce our use of the explicitly frozen images
...
This requires that any environment where we wish to run the integration-cli tests includes both the `Dockerfile` and `curl`, which has been deemed an appropriate and acceptable trade-off.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-16 14:42:59 -06:00
8ae20d8eba
Merge pull request #10977 from robertabbott/10959-progressreader
...
Moves progressreader from utils to its own package
2015-03-16 12:45:33 -07:00
636037c363
Fix test pull verified
...
Update pull code to consider any layer download or new tag as an update.
Update hello-world frozen image to be explicitly tagged as frozen, to not interfere with pull tests. The hello-world is used by pull tests because of its small size and there is no other official image with such a size.
fixes #11383
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-03-16 12:22:00 -07:00
6485d885a0
Merge pull request #11323 from delftswa2014/utils-daemon-windows
...
Make utils_daemon and volumes.go cross-platform compileable (Windows).
2015-03-16 12:14:30 -07:00
ed435fb458
Merge pull request #11403 from sapphiredev/typo
...
Fix minor typo
2015-03-16 10:17:14 -07:00
8dc5791f73
fix panic error when docker stats a stopped container
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-16 19:55:34 +08:00
210ab030bc
Format error by value
...
- Use `%v` verb to format errors.
- Give `param` constant in portallocator some better name.
Signed-off-by: Michal Minar <miminar@redhat.com>
2015-03-16 12:05:53 +01:00
4b0744b119
Fix minor typo
...
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
2015-03-16 19:50:52 +09:00
1ec2eac50d
Make utils_daemon and volumes cross-platform compileable.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
2015-03-16 11:46:07 +01:00
88924993a2
Merge pull request #11393 from enguerran/patch-1
...
Ambiguous example in registry_mirror.md
2015-03-16 16:21:00 +10:00
82f390e139
Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo
...
use type WARN for warning
2015-03-15 21:13:23 -07:00
bc7d1d6ef3
Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig
...
move resource options from Config to hostConfig
2015-03-15 17:30:46 -07:00
a9e19a2672
Merge pull request #11392 from moxiegirl/copy-edit-contribute
...
Adding in minor copy edits
2015-03-15 08:02:58 -07:00
0cd857d99f
Update registry_mirror.md
...
The syntactic coloration is a little bit ambiguous, I suggest this as a fix.
Signed-off-by: Enguerran Colson <engcolson@gmail.com>
2015-03-15 12:35:43 +01:00
dc899c4eaf
Adding in minor copy edits
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-14 21:31:36 -07:00
495f5e4998
Merge pull request #11321 from duglin/CmdLineTweak
...
Add "Docker" to Reference pull-down for Command Line
2015-03-14 21:04:25 -06:00
2830b6fa58
Merge pull request #11297 from moxiegirl/11235-tweak-doc
...
Consistency in the restart policy docs
2015-03-14 19:58:46 -07:00
e0cb65b4a9
Merge pull request #11389 from aidanhs/aphs-allow-nonexistent-gid-fix
...
Correctly check that gid parses as an int
2015-03-14 16:12:35 -07:00
8ef79ae8e4
Correctly check that gid parses as an int
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-14 23:02:53 +00:00
649d8333ce
Merge pull request #11377 from aidanhs/aphs-allow-nonexistent-gid
...
Allow a non-existent groupid to own the docker socket
2015-03-14 15:01:10 -07:00
8a5b50d65d
Generate an error on unknown Dockerfile instruction
...
Instead of just printing a warning and going on, this will generate
an error and stop processing.
This used to be part of #10561 but I decided it might need its own
independent discussion/PR as to not derail #10561 .
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-13 16:08:34 -07:00
e2ca237aa2
Merge pull request #11345 from x1022as/cli
...
Change cli.md to show right `docker rmi` output
2015-03-13 16:33:03 -06:00
d2f925fb27
Merge pull request #11373 from tianon/move-hack-scripts-back
...
Move scripts back to hack/, leave docs in project/
2015-03-13 15:26:54 -07:00
02c1dd899a
Merge pull request #10238 from miminar/ephemeral-port-range-allocation
...
Use system's ephemeral port range for port allocation
2015-03-13 15:18:05 -07:00
db39cc8351
Merge pull request #11379 from sbasyal/patch-1
...
Update Centos links
2015-03-13 13:50:53 -07:00
949a21b55f
Move scripts back to hack/, leave docs in project/
...
This also removes the now-defunct `*maintainer*.sh` scripts that don't work with the new TOML format, and moves a couple not-build-or-release-related scripts to `contrib/` instead.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-13 14:04:08 -06:00
a97fbe7d78
Merge pull request #11378 from LK4D4/update_libcontainer
...
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
2015-03-13 12:14:54 -07:00
dba4651760
Update Centos links
...
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
2015-03-13 11:48:09 -07:00
eade8eac09
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
...
It includes new Type() method for Factory, which needed for replacing
execdriver.Driver.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-13 11:33:49 -07:00
Jessie Frazelle
Phil Estes
Michael Crosby
Alexander Morozov
Derek McGowan
Mrunal Patel
Arnaud Porterie
Tibor Vass
Lars Kellogg-Stedman
Phil Estes
Tianon Gravi
Alexander Morozov
Qiang Huang
Michal Minar
sapphiredev
Rik Nijessen
Sven Dowideit
moxiegirl
Enguerran
Mary Anthony
James Turnbull
Aidan Hobson Sayers
Doug Davis
Sabin Basyal