1e686c8b8b
Add 'extras' virtual package to fix kernel upgrade fallback from aufs to devicemapper
...
Added checks for the proper kernel support before blindly installing extras package
Fixes #10859
Signed-off-by: Matt Bentley <mbentley@mbentley.net >
Upstream-commit: b89d04dd62e1a779f449804772c5bc5b64af65e8
Component: engine
2015-03-16 07:46:18 -04:00
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
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
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
8af0df8590
Merge pull request #11392 from moxiegirl/copy-edit-contribute
...
Adding in minor copy edits
Upstream-commit: a9e19a26724ca784be2b135bb690923e672913c0
Component: engine
2015-03-15 08:02:58 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
8af9ec43ba
Merge pull request #11378 from LK4D4/update_libcontainer
...
Update libcontainer to 5d6c507d7cfeff97172deedf3db13b5295bcacef
Upstream-commit: a97fbe7d7819041e605048ab386bbd5fba2d5b33
Component: engine
2015-03-13 12:14:54 -07:00
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
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
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
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
3b87f2d7b5
Merge pull request #11374 from tianon/cpusets
...
Add CONFIG_CPUSETS to check-config.sh
Upstream-commit: b44aae395a5a5068868cf3f586699314587a873b
Component: engine
2015-03-13 09:12:21 -07:00
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
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
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
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
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
8ab6b4e2b5
Merge pull request #11359 from sunyuan3/m1
...
correct some daemon spelling mistakes
Upstream-commit: 4e7bf0dde4ac6707b24733a8e65da1ca10c40162
Component: engine
2015-03-12 22:17:19 -04:00
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
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
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
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
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
fd3cd22156
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 >
Upstream-commit: 27aab3acc6b38ddc39d19e16d61d47f0a4436350
Component: engine
2015-03-12 12:32:16 -06:00
3dc824af8c
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 >
Upstream-commit: c0f7819905050ebdb583afba5b6f760d3892adb8
Component: engine
2015-03-12 08:13:00 -07:00
540b15bb62
Makes directory pkg compilable on Windows.
...
Also makes the test cases platform independent.
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 46d4f12fbf25d605f2d034c8cc68f25a47164190
Component: engine
2015-03-12 15:54:22 +01:00
7f7a47b98e
Merge pull request #11265 from duglin/ScratchSHfix
...
Fix builder when num of RUN args is 1
Upstream-commit: 565cff84b1ae13e21fa74af83e58d29bafbca47a
Component: engine
2015-03-12 09:30:56 -05:00
10fceb4fae
Merge pull request #11269 from tianon/update-simple
...
Update Dockerfile.simple to include aufs-tools
Upstream-commit: 5d174e000f9e0d0d4d557367ab7685834d190a71
Component: engine
2015-03-12 10:05:56 -04:00
3ac5e5187d
Merge pull request #11342 from sunyuan3/spellingmistake
...
correct a spelling mistake
Upstream-commit: d9c6787b4aa00db33b0f607dc67f1a83565f5269
Component: engine
2015-03-12 05:54:49 -07:00
182d2d03b5
correct a spelling mistake
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a02256577ab0806f004e41fd94aaaed52d1aff97
Component: engine
2015-03-12 09:22:51 -04:00
9bcc20bae4
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 >
Upstream-commit: 98610282c23746eed4399b5ddf4f7d93de255298
Component: engine
2015-03-12 19:06:48 +08:00
20b7c132ab
Merge pull request #11278 from ahmetalpbalkan/win-cli/fakeGIT
...
integ-cli: use httpserver container for fakeGIT
Upstream-commit: 52f6da223839a5ac1fc003b259b74f6a02fc2858
Component: engine
2015-03-11 18:19:11 -07:00
2fb233b0f3
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)
Upstream-commit: 3bcd2006b56ad57caa7e8723c3269cbd50af1f4a
Component: engine
2015-03-11 17:38:35 -07:00
282d3dadfd
Merge pull request #11331 from jfrazelle/update-logrus
...
Update logrus to 0.6.6
Upstream-commit: 5494432f917eb0f6e4cf73deed366f6830ec64ec
Component: engine
2015-03-11 16:18:22 -07:00
69e2749ca8
Merge pull request #11248 from Finkes/patch-1
...
improve Debian installation instructions
Upstream-commit: 254b6f8946dd7cceaa32d5e1da981287ace5f0f5
Component: engine
2015-03-11 15:36:01 -07:00
e0e2bdc16b
Merge pull request #11280 from MabinGo/docs_api-enable-cors_deprecated
...
docs: --api-enable-cors is deprecated,updated docs description
Upstream-commit: cc4095a18cfff27dfca77251978b6a9bdaa5c86a
Component: engine
2015-03-11 15:28:28 -07:00
10a769231a
Merge pull request #11329 from estesp/fix-run-test-doc
...
Remove escaping from TESTFLAGS; it is no longer required
Upstream-commit: 5b5b09275e47d3b2a91eef0122865388dc7774a8
Component: engine
2015-03-11 15:01:17 -07:00
018c3380f4
Merge pull request #11325 from duglin/11289-HelpDashF
...
Minor tweak to build -f text to make it clear Dockerfile is in context
Upstream-commit: 24408f1c18790bf607452108943b3e18cbb61f38
Component: engine
2015-03-11 14:58:38 -07:00
61eb7821e7
Merge pull request #11311 from delftswa2014/11309-add-filter-name
...
Adds 'name' filter to the CLI reference.
Upstream-commit: f960a79b7c0be371697f914fc8b2e270c73cc974
Component: engine
2015-03-11 14:54:51 -07:00
