Sven Dowideit
88924993a2
Merge pull request #11393 from enguerran/patch-1
...
Ambiguous example in registry_mirror.md
2015-03-16 16:21:00 +10:00
Arnaud Porterie
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
Arnaud Porterie
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
moxiegirl
a9e19a2672
Merge pull request #11392 from moxiegirl/copy-edit-contribute
...
Adding in minor copy edits
2015-03-15 08:02:58 -07:00
Enguerran
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
Mary Anthony
dc899c4eaf
Adding in minor copy edits
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-14 21:31:36 -07:00
James Turnbull
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
moxiegirl
2830b6fa58
Merge pull request #11297 from moxiegirl/11235-tweak-doc
...
Consistency in the restart policy docs
2015-03-14 19:58:46 -07:00
Jessie Frazelle
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
Aidan Hobson Sayers
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
Jessie Frazelle
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
James Turnbull
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
Jessie Frazelle
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
Alexander Morozov
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
moxiegirl
db39cc8351
Merge pull request #11379 from sbasyal/patch-1
...
Update Centos links
2015-03-13 13:50:53 -07:00
Tianon Gravi
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
Michael Crosby
a97fbe7d78
Merge pull request #11378 from LK4D4/update_libcontainer
...
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
2015-03-13 12:14:54 -07:00
Sabin Basyal
dba4651760
Update Centos links
...
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
2015-03-13 11:48:09 -07:00
Alexander Morozov
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
Aidan Hobson Sayers
334382a8c3
Allow a non-existent groupid to own the docker socket
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2015-03-13 18:12:50 +00:00
Arnaud Porterie
6374c12fbb
Merge pull request #11350 from delftswa2014/utils-directory-windows
...
Makes `directory` pkg compilable on Windows.
2015-03-13 09:26:08 -07:00
Arnaud Porterie
b44aae395a
Merge pull request #11374 from tianon/cpusets
...
Add CONFIG_CPUSETS to check-config.sh
2015-03-13 09:12:21 -07:00
Tianon Gravi
03de73a5e0
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>
2015-03-13 09:18:10 -06:00
Steve Francia
e79c91447f
Merge pull request #11363 from moxiegirl/split-contribute-out
...
Breaking out the project into more granular pieces
2015-03-13 08:33:51 -04:00
Michal Minar
40d5406371
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>
2015-03-13 09:40:53 +01:00
Mary Anthony
ec728939b1
Breaking out the project into more granular pieces
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-03-12 22:27:49 -07:00
Phil Estes
88c706e442
Merge pull request #11349 from cpuguy83/11132_better_error_message_on_graph_init
...
Make errors from graphdriver friendlier
2015-03-12 23:26:35 -04:00
Doug Davis
4e7bf0dde4
Merge pull request #11359 from sunyuan3/m1
...
correct some daemon spelling mistakes
2015-03-12 22:17:19 -04:00
Yuan Sun
906974b185
correct some daemon spelling mistakes
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-13 05:14:56 -04:00
Jessie Frazelle
50c6c675e6
Merge pull request #11351 from tianon/bash-3-frozen
...
Update "download-frozen-image.sh" with Bash 3 support for msysGit
2015-03-12 18:05:11 -07:00
Michael Crosby
eb435d70c1
Merge pull request #11340 from fredlf/docs-lgtms
...
Adds Fred, updates docs LGTMs
2015-03-12 14:35:23 -07:00
moxiegirl
e781c9624c
Merge pull request #10620 from acbodine/notify_user_of_creds_save
...
Adds: notify user of login credential persistence for registry
2015-03-12 13:43:20 -07:00
Alexander Morozov
227f60ce76
Merge pull request #10924 from tcnghia/master
...
engine.Tail() to ignore trailing whitespaces.
2015-03-12 12:55:48 -07:00
Tianon Gravi
27aab3acc6
Update "download-frozen-image.sh" with Bash 3 support for msysGit
...
This uses a bit of on-disk state in our export directory to emulate our associative array for generating the "repositories" JSON file.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-12 12:32:16 -06:00
Brian Goff
c0f7819905
Make errors from graphdriver init friendlier
...
In several cases graphdriver were just returning the low-level syscall
error and that was making it all the way up to the daemon logs and in
many cases was difficult to tell it was even coming from the graphdriver
at all.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-12 08:13:00 -07:00
Rick Wieman
46d4f12fbf
Makes directory pkg compilable on Windows.
...
Also makes the test cases platform independent.
Signed-off-by: Rick Wieman <git@rickw.nl>
2015-03-12 15:54:22 +01:00
Tibor Vass
565cff84b1
Merge pull request #11265 from duglin/ScratchSHfix
...
Fix builder when num of RUN args is 1
2015-03-12 09:30:56 -05:00
Phil Estes
5d174e000f
Merge pull request #11269 from tianon/update-simple
...
Update Dockerfile.simple to include aufs-tools
2015-03-12 10:05:56 -04:00
Brian Goff
d9c6787b4a
Merge pull request #11342 from sunyuan3/spellingmistake
...
correct a spelling mistake
2015-03-12 05:54:49 -07:00
Yuan Sun
a02256577a
correct a spelling mistake
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-12 09:22:51 -04:00
Deng Guangxing
98610282c2
Change cli.md to show right docker rmi
output
...
`docker rmi` output in docs/sources/reference/commandline/cli.md
is different from real scene. This commit fixes it.
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-03-12 19:06:48 +08:00
Jessie Frazelle
52f6da2238
Merge pull request #11278 from ahmetalpbalkan/win-cli/fakeGIT
...
integ-cli: use httpserver container for fakeGIT
2015-03-11 18:19:11 -07:00
Fred Lifton
3bcd2006b5
Adds Fred to list of people and clarifies that docs approval requires only two LGTMS (not a "majority" as it was before Mary and Steve were added).
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2015-03-11 17:38:35 -07:00
Michael Crosby
5494432f91
Merge pull request #11331 from jfrazelle/update-logrus
...
Update logrus to 0.6.6
2015-03-11 16:18:22 -07:00
moxiegirl
254b6f8946
Merge pull request #11248 from Finkes/patch-1
...
improve Debian installation instructions
2015-03-11 15:36:01 -07:00
moxiegirl
cc4095a18c
Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
...
docs: --api-enable-cors is deprecated,updated docs description
2015-03-11 15:28:28 -07:00
moxiegirl
5b5b09275e
Merge pull request #11329 from estesp/fix-run-test-doc
...
Remove escaping from TESTFLAGS; it is no longer required
2015-03-11 15:01:17 -07:00
moxiegirl
24408f1c18
Merge pull request #11325 from duglin/11289-HelpDashF
...
Minor tweak to build -f text to make it clear Dockerfile is in context
2015-03-11 14:58:38 -07:00
moxiegirl
f960a79b7c
Merge pull request #11311 from delftswa2014/11309-add-filter-name
...
Adds 'name' filter to the CLI reference.
2015-03-11 14:54:51 -07:00
Tibor Vass
d6a6c7d4d9
Merge pull request #11310 from ahmetalpbalkan/win-cli/ping-icmp
...
integ-cli: remove ICMP dependency from test, use nslookup
2015-03-11 17:53:50 -04:00