Commit Graph

12719 Commits

Author SHA1 Message Date
Michael Crosby 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
Jessie Frazelle 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
Jessie Frazelle 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
Tibor Vass 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
Phil Estes 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
Jessie Frazelle 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
Derek McGowan 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
Michael Crosby 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
Lars Kellogg-Stedman 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
Jessie Frazelle 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
Michael Crosby 1902f8ca99 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)
Upstream-commit: 66bf7a269a29c1058384727ec852024198a5db77
Component: engine
2015-03-16 14:12:48 -07:00
Phil Estes 7741ef02eb 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)
Upstream-commit: 334aea3441d9e499b7f999098a16abcb81d16a68
Component: engine
2015-03-16 16:52:00 -04:00
Tianon Gravi acb7ebba38 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>
Upstream-commit: 793ebba3d6c7882897125116cd22ade87c6f37a6
Component: engine
2015-03-16 14:42:59 -06:00
Alexander Morozov 2479608ad5 Merge pull request #10977 from robertabbott/10959-progressreader
Moves progressreader from utils to its own package
Upstream-commit: 8ae20d8eba127361bc07260580e2d3b8e3628c3e
Component: engine
2015-03-16 12:45:33 -07:00
Derek McGowan f32b25fee3 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)
Upstream-commit: 636037c3637eb1d09cc469cebe39ffb915bb0aa9
Component: engine
2015-03-16 12:22:00 -07:00
Alexander Morozov f923b4fab0 Merge pull request #11323 from delftswa2014/utils-daemon-windows
Make utils_daemon and volumes.go cross-platform compileable (Windows).
Upstream-commit: 6485d885a061a49b0f8d7aa27ec44afcccf56a98
Component: engine
2015-03-16 12:14:30 -07:00
Qiang Huang 45269e9133 fix panic error when docker stats a stopped container
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 8dc5791f7302aea0734a26dc1f54d96b04771b8f
Component: engine
2015-03-16 19:55:34 +08:00
sapphiredev 914df48348 Fix minor typo
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
Upstream-commit: 4b0744b1191622722c0cd24e9b4d46286e5e9c79
Component: engine
2015-03-16 19:50:52 +09:00
Rik Nijessen b06c1f22f7 Make utils_daemon and volumes cross-platform compileable.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 1ec2eac50db2c98e00a488664625a22bf3757066
Component: engine
2015-03-16 11:46:07 +01:00
Sven Dowideit 58b612822c Merge pull request #11393 from enguerran/patch-1
Ambiguous example in registry_mirror.md
Upstream-commit: 88924993a29c2997809471b802f046549b7f0d18
Component: engine
2015-03-16 16:21:00 +10:00
Arnaud Porterie b3678f8418 Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo
use type WARN for warning
Upstream-commit: 82f390e139e611b97911c19dd1be2a98264cf4b9
Component: engine
2015-03-15 21:13:23 -07:00
Arnaud Porterie ed5523443d Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig
move resource options from Config to hostConfig
Upstream-commit: bc7d1d6ef307b05b0951f5c884620a87c5ac8f7d
Component: engine
2015-03-15 17:30:46 -07:00
Enguerran 3e5ae00db7 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>
Upstream-commit: 0cd857d99f3b57db7db9f8668f57fb1788a7ae01
Component: engine
2015-03-15 12:35:43 +01:00
Mary Anthony 206ad49d5c Adding in minor copy edits
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: dc899c4eaf1261ba0d5a740271bba0bfc866ae3c
Component: engine
2015-03-14 21:31:36 -07:00
James Turnbull 8f90223a50 Merge pull request #11321 from duglin/CmdLineTweak
Add "Docker" to Reference pull-down for Command Line
Upstream-commit: 495f5e4998d5d6d4eb2115a196cb33ae7716ab9b
Component: engine
2015-03-14 21:04:25 -06:00
moxiegirl a7edb719ca Merge pull request #11297 from moxiegirl/11235-tweak-doc
Consistency in the restart policy docs
Upstream-commit: 2830b6fa584216b9e6aabe71d57bf04b8879a485
Component: engine
2015-03-14 19:58:46 -07:00
Jessie Frazelle aa2660197d Merge pull request #11389 from aidanhs/aphs-allow-nonexistent-gid-fix
Correctly check that gid parses as an int
Upstream-commit: e0cb65b4a9e0f420bdc7cb9b41d2174e6144392b
Component: engine
2015-03-14 16:12:35 -07:00
Aidan Hobson Sayers 9bd1fc5995 Correctly check that gid parses as an int
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 8ef79ae8e42ae020a373712bd7d08bcb81e3fa97
Component: engine
2015-03-14 23:02:53 +00:00
Jessie Frazelle 0390507a59 Merge pull request #11377 from aidanhs/aphs-allow-nonexistent-gid
Allow a non-existent groupid to own the docker socket
Upstream-commit: 649d8333ce0c662eafa69784a87bd1a2f72599f7
Component: engine
2015-03-14 15:01:10 -07:00
Doug Davis 0a3eeb1d23 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>
Upstream-commit: 8a5b50d65dae2d0607e046c57241dd6b46b65c6a
Component: engine
2015-03-13 16:08:34 -07:00
James Turnbull 3d8e1bb89a Merge pull request #11345 from x1022as/cli
Change cli.md to show right `docker rmi` output
Upstream-commit: e2ca237aa26c73717af9111babf7f82c1123e5df
Component: engine
2015-03-13 16:33:03 -06:00
Jessie Frazelle 60c2c94566 Merge pull request #11373 from tianon/move-hack-scripts-back
Move scripts back to hack/, leave docs in project/
Upstream-commit: d2f925fb2784bbecb71f760a8fda3748b4db0a87
Component: engine
2015-03-13 15:26:54 -07:00
Alexander Morozov 1174b9d420 Merge pull request #10238 from miminar/ephemeral-port-range-allocation
Use system's ephemeral port range for port allocation
Upstream-commit: 02c1dd899a7ea84c89cb6f5a87297f4690e393ef
Component: engine
2015-03-13 15:18:05 -07:00
moxiegirl 7b2c2c2a97 Merge pull request #11379 from sbasyal/patch-1
Update Centos links
Upstream-commit: db39cc835166984fb50f28507a1afbbe622eae2b
Component: engine
2015-03-13 13:50:53 -07:00
Tianon Gravi 719f00fbf2 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>
Upstream-commit: 949a21b55f3b8d7d1ae7a7b9829111a8f0dbf7e2
Component: engine
2015-03-13 14:04:08 -06:00
Sabin Basyal 0d2843f030 Update Centos links
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
Upstream-commit: dba4651760d3ba41ea94cb9ab55abcd91cce1229
Component: engine
2015-03-13 11:48:09 -07:00
Alexander Morozov 08d67abfd9 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>
Upstream-commit: eade8eac09ad8cfdaf762e88d382daf6017201d7
Component: engine
2015-03-13 11:33:49 -07:00
Aidan Hobson Sayers b9f12f801a Allow a non-existent groupid to own the docker socket
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 334382a8c31285689f0b060de81b8f631d928970
Component: engine
2015-03-13 18:12:50 +00:00
Arnaud Porterie 8aa46e814e Merge pull request #11350 from delftswa2014/utils-directory-windows
Makes `directory` pkg compilable on Windows.
Upstream-commit: 6374c12fbb09d3fa04a46bc951e3c9e8baeac63f
Component: engine
2015-03-13 09:26:08 -07:00
Tianon Gravi baa877aaee Add CONFIG_CPUSETS to check-config.sh
See also https://bugs.gentoo.org/show_bug.cgi?id=536546:

```console
$ docker run learn/tutorial echo "hello world"
FATA[0001] Error response from daemon: Cannot start container 1d0c0ca5cc7f39a271ec40c1479a80bffb7190fab97392b3453a1fc0b2dc8e78: mountpoint for cpuset not found
```

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 03de73a5e075e16656f5399f1957f7190f7bdc44
Component: engine
2015-03-13 09:18:10 -06:00
Steve Francia f792a41d7a Merge pull request #11363 from moxiegirl/split-contribute-out
Breaking out the project into more granular pieces
Upstream-commit: e79c91447f623da6ac9bd5f8097a4e54421b50ab
Component: engine
2015-03-13 08:33:51 -04:00
Michal Minar dc9421e6d9 Pass buffered file reader to Fscanf instead of string reader
Unless `file` is wrapped with buffered reader, `fmt.Fscanf` will read
just one byte and terminate with `EOF`.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: 40d540637168fd5781e0c4a9cbd91959b7407d96
Component: engine
2015-03-13 09:40:53 +01:00
Ma Shimiao 41bb51dc38 Update docker manpage
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: fa1fa50160ec78f87ef7e461c752d9b4d1410cd3
Component: engine
2015-03-13 15:28:09 +08:00
Mary Anthony 65389ed10a Breaking out the project into more granular pieces
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: ec728939b167a32226d7556af38a51d3bc3a1b9e
Component: engine
2015-03-12 22:27:49 -07:00
Phil Estes 6fd6c2d05a Merge pull request #11349 from cpuguy83/11132_better_error_message_on_graph_init
Make errors from graphdriver friendlier
Upstream-commit: 88c706e442fb489387ba8ef5fd2de42479f74b87
Component: engine
2015-03-12 23:26:35 -04:00
Yuan Sun e70ef80162 correct some daemon spelling mistakes
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 906974b185b431a8c493479f748677f3c0bc4ca3
Component: engine
2015-03-13 05:14:56 -04:00
Jessie Frazelle b6672fca8d Merge pull request #11351 from tianon/bash-3-frozen
Update "download-frozen-image.sh" with Bash 3 support for msysGit
Upstream-commit: 50c6c675e666d2e17a961b40a82306219053c2a1
Component: engine
2015-03-12 18:05:11 -07:00
Michael Crosby 266f46c668 Merge pull request #11340 from fredlf/docs-lgtms
Adds Fred, updates docs LGTMs
Upstream-commit: eb435d70c138c842c238b4513c3c63cb7547c030
Component: engine
2015-03-12 14:35:23 -07:00
moxiegirl 0b6f77080d Merge pull request #10620 from acbodine/notify_user_of_creds_save
Adds: notify user of login credential persistence for registry
Upstream-commit: e781c9624cb3b646fde1501d95d15933eedadf1e
Component: engine
2015-03-12 13:43:20 -07:00
Alexander Morozov b4071d7043 Merge pull request #10924 from tcnghia/master
engine.Tail() to ignore trailing whitespaces.
Upstream-commit: 227f60ce76a0b73ea0b6534cab34dd7ae777a6f6
Component: engine
2015-03-12 12:55:48 -07:00