db39cc8351
Merge pull request #11379 from sbasyal/patch-1
...
Update Centos links
2015-03-13 13:50:53 -07: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
6374c12fbb
Merge pull request #11350 from delftswa2014/utils-directory-windows
...
Makes `directory` pkg compilable on Windows.
2015-03-13 09:26:08 -07:00
b44aae395a
Merge pull request #11374 from tianon/cpusets
...
Add CONFIG_CPUSETS to check-config.sh
2015-03-13 09:12:21 -07:00
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
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
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
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
4e7bf0dde4
Merge pull request #11359 from sunyuan3/m1
...
correct some daemon spelling mistakes
2015-03-12 22:17:19 -04:00
906974b185
correct some daemon spelling mistakes
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-13 05:14:56 -04:00
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
eb435d70c1
Merge pull request #11340 from fredlf/docs-lgtms
...
Adds Fred, updates docs LGTMs
2015-03-12 14:35:23 -07:00
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
227f60ce76
Merge pull request #10924 from tcnghia/master
...
engine.Tail() to ignore trailing whitespaces.
2015-03-12 12:55:48 -07:00
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
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
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
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
5d174e000f
Merge pull request #11269 from tianon/update-simple
...
Update Dockerfile.simple to include aufs-tools
2015-03-12 10:05:56 -04:00
d9c6787b4a
Merge pull request #11342 from sunyuan3/spellingmistake
...
correct a spelling mistake
2015-03-12 05:54:49 -07:00
a02256577a
correct a spelling mistake
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-12 09:22:51 -04:00
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
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
5494432f91
Merge pull request #11331 from jfrazelle/update-logrus
...
Update logrus to 0.6.6
2015-03-11 16:18:22 -07:00
254b6f8946
Merge pull request #11248 from Finkes/patch-1
...
improve Debian installation instructions
2015-03-11 15:36:01 -07:00
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
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
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
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
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
004ac85aa2
integ-cli: remove ICMP dependency from test, use nslookup
...
As we started running CI machines on Azure cloud and Azure
doesn't have ICMP stack implemented by replacing
`ping 8.8.8.8` with `nslookup google.com`.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-11 14:27:11 -07:00
c6321931d2
Merge pull request #11326 from cpuguy83/11315_rename_w_daemon_restart
...
Persist container to disk after rename
2015-03-11 13:44:13 -07:00
bf35122890
Merge pull request #11330 from ahmetalpbalkan/win-cli/events-daemon-time
...
integ-cli: Fix clock skew against remote test daemon
2015-03-11 13:40:37 -07:00
586f75d61c
Merge pull request #11333 from crosbymichael/upldate-libcontainer-mar-11
...
Update libcontainer to aa10040b570386c1ae311c6245b
2015-03-11 13:04:51 -07:00
c5c72cf151
Persist container to disk after rename
...
Fixes #11315
After rename occured the graphdb was updated but the container struct
was never commited back to disk, so on daemon restart it loads the old
name again.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-11 12:39:31 -07:00
cddb443da4
improve Debian installation instructions
...
Signed-off-by: Dominik Finkbeiner <finkes93@gmail.com>
2015-03-11 20:14:32 +01:00
c553be5a4f
Update libcontainer to aa10040b570386c1ae311c6245b
...
Includes mqueue label fix and cgroups improvements.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-11 11:49:15 -07:00
89e2e5fc55
Update logrus to 0.6.6
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-11 11:29:13 -07:00
e424c54d9c
integ-cli: fix clock skew against remote test daemon
...
This fixes the `docker events`-related tests as they have been
failing due to clock skew between CI machine and test daemon on
some other machine (even 1-2 seconds of diff causes races as
we pass local time to --since/--until).
If we're running in same host, we keep using time.Now(), otherwise
we read the system time of the daemon from `/info` endpoint.
Fixes pretty much all events-related tests on windows CI.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-11 10:28:56 -07:00
ed3f383507
Remove escaping from TESTFLAGS; it is no longer required
...
In fact, it doesn't work as the bare `\` backslashes are now preserved
and therefore are not valid regex matches on any test, making it not run
any tests at all. I assume at some point there was a process in the
pipeline that needed escaping, but on master (for quite a while) this
has not worked.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-11 13:09:40 -04:00
d010bf0d99
Merge pull request #11291 from ahmetalpbalkan/info/system-date
...
Add system time to /info
2015-03-11 09:43:43 -07:00
1b46248a33
Minor tweak to build -f text to make it clear Dockerfile is in context
...
Closes #11289
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-11 09:04:30 -07:00
645f8a32df
Fix builder when num of RUN args is 1
...
FROM scratch
ADD echo /
RUN [ "echo" ]
will die with
exec: "/bin/sh": stat /bin/sh: no such file or directory
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-11 07:30:44 -07:00
830544044e
Merge pull request #11317 from zenlinTechnofreak/helpSuffixSpace
...
Help suffix space
2015-03-11 10:04:23 -04:00
1a5e46ce89
Merge pull request #11316 from ahmetalpbalkan/win-cli/help-homepath-fix
...
Make use of %USERPROFILE% in cli help message
2015-03-11 09:28:43 -04:00
491b63e0da
Add checking trailing space for all lines of the help output
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-11 21:24:30 +08:00
95dcb27484
Merge pull request #11244 from ChristopherBiscardi/docs-code-fixes
...
Fix a few code rendering errors in docs
2015-03-11 08:34:53 -04:00
2b051bcbda
Normalize the log for docker subcommand usage,
...
delete unecessary blank after "[OPTIONS] "
and add a blank to the log between options and signature.
To make the code style consistency.
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-11 18:58:32 +08:00
moxiegirl
Michael Crosby
Sabin Basyal
Alexander Morozov
Arnaud Porterie
Tianon Gravi
Steve Francia
Mary Anthony
Phil Estes
Doug Davis
Yuan Sun
Jessie Frazelle
Alexander Morozov
Brian Goff
Rick Wieman
Tibor Vass
Fred Lifton
Ahmet Alp Balkan
Dominik Finkbeiner
Michael Crosby
Jessica Frazelle
Phil Estes
Doug Davis
Zen Lin(Zhinan Lin)