Mary Anthony
762214ccc8
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 07:32:58 -07:00
Sebastiaan van Stijn
bca32648f4
Merge pull request #14195 from ch3lo/master
...
update in Kitematic OS support
2015-07-03 18:05:27 +02:00
Marcelo Salazar
1b3bde47ef
update in Kitematic OS support
...
Kitematic now support Windows
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com >
2015-07-03 12:32:00 -03:00
Sebastiaan van Stijn
a89f4e36ab
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
2015-07-03 16:56:04 +02:00
Tristan Carel
515df52f19
Rewrite DockerHub group permissions documentation
...
On behalf of @moxiegirl
https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
2015-07-03 16:29:30 +02:00
Doug Davis
0dedadd4d6
Merge pull request #14377 from coolljt0725/validate_restart_policy
...
Validate restart policy. Fixes #14351
2015-07-03 07:01:44 -05:00
Lei Jitang
f3faf59925
Validate restart policy. Fixes #14351
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-03 17:33:33 +08:00
Sebastiaan van Stijn
7b0666f568
Merge pull request #14378 from airandfingers/patch-2
...
Edit "Working with Containers" page for readability
2015-07-03 08:43:50 +02:00
ayoshitake
0ed7fd46b6
Edit "Working with Containers" page for readability
...
Signed-off-by: ayoshitake <airandfingers@gmail.com >
2015-07-02 23:10:36 -07:00
James Turnbull
d7326bd787
Merge pull request #14190 from ankushagarwal/experimentalDownloadLink
...
Document the location of experimental binary
2015-07-02 20:14:15 -04:00
James Turnbull
7dc8e77cc7
Merge pull request #14295 from Lennie/patch-1
...
Fix for broken link
2015-07-02 19:24:57 -04:00
Sebastiaan van Stijn
a45576ab40
Merge pull request #14104 from mariusGundersen/patch-1
...
Spelling
2015-07-03 01:03:58 +02:00
Ankush Agarwal
01cfb70b0a
Document the location of experimental binary
...
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-02 15:59:13 -07:00
David Calavera
5b2d14fbbf
Merge pull request #14349 from hqhq/hq_error_for_todisk
...
Show error message when todisk failed
2015-07-02 15:56:56 -07:00
Jessie Frazelle
9356c76d9f
Merge pull request #14064 from jfrazelle/no-cache-for-experimental
...
add no cache for experimental builds bc cloudfront
2015-07-02 17:24:29 -04:00
Jessica Frazelle
0cc664fae3
add no cache for experimental builds bc cloudfront
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-02 13:50:11 -07:00
David Calavera
71f8ca30ce
Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately
...
Send resp immediately on GET /events
2015-07-02 12:00:45 -07:00
Arnaud Porterie
f0ed68f852
Merge pull request #14292 from calavera/fix_driver_detection
...
Fix implicit DeviceMapper selection
2015-07-02 11:33:55 -07:00
Phil Estes
e3d488e280
Merge pull request #13851 from ewindisch/no-allow-rc4
...
Remove RC4 from the list of registry cipher suites
2015-07-02 13:11:40 -04:00
Alexander Morozov
36f6b7331e
Merge pull request #14350 from moysesb/fixdoc
...
Fixed outdated comment.
2015-07-02 10:06:31 -07:00
David Calavera
0a376291b2
Fix implicit DeviceMapper selection
...
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.
With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-02 09:21:27 -07:00
Brian Goff
d0a299c027
Send resp immediately on GET /events
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-02 11:45:24 -04:00
Alexander Morozov
f58758ce36
Merge pull request #14355 from vdemeester/log-to-logrus
...
Replace latest log by logrus
2015-07-02 08:20:16 -07:00
Vincent Demeester
10e114fb95
Replace latest log by logrus
...
Related to #11618 and #11614
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-02 16:11:52 +02:00
Sebastiaan van Stijn
9300eb6684
Merge pull request #13825 from Mashimiao/unify-help-message
...
Unify docker commands' usage in man and help
2015-07-02 15:31:57 +02:00
Sebastiaan van Stijn
ddc9bc6c56
Merge pull request #14341 from ankushagarwal/ubuntuUglyDocs
...
Fix missing newline
2015-07-02 15:17:27 +02:00
Moysés Borges
8b0e40bb38
Fixed outdated comment.
...
Synchronized the comment for httputils/mimetype.DetectContentType
with the actual code.
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-07-02 08:17:11 -03:00
Qiang Huang
af7f81878f
Show error message when todisk failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-02 18:24:35 +08:00
Ma Shimiao
f38232b475
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-02 10:33:26 +08:00
Ankush Agarwal
942a0f994f
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-01 18:16:22 -07:00
Sebastiaan van Stijn
98f988f62c
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
2015-07-02 01:31:15 +02:00
Sebastiaan van Stijn
f51d77f86e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
2015-07-02 01:27:47 +02:00
Alexander Morozov
75864dcb38
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
2015-07-01 15:19:46 -07:00
Alexander Morozov
9b9a4b2e59
Merge pull request #14329 from runcom/14318-fix-regression-cap-add-drop-as-single-string
...
Fix regression in parsing capabilities
2015-07-01 13:28:07 -07:00
Brian Goff
1751b40b04
Merge pull request #14333 from LK4D4/fix_tags
...
Fix windows tag in pkg/term
2015-07-01 16:27:57 -04:00
Alexander Morozov
7b3492df0c
Fix windows tag in pkg/term
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-01 13:16:16 -07:00
Antonio Murdaca
10a3061c5f
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 21:28:02 +02:00
Alessandro Boch
8b40e44c39
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-07-01 11:15:16 -07:00
Alexander Morozov
358c022cac
Merge pull request #14321 from MattHauglustaine/14266-return-envfile-parse-bufio-error
...
Return bufio error when parsing env file
2015-07-01 11:06:33 -07:00
Alexander Morozov
53b897ce9c
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
2015-07-01 10:57:33 -07:00
Brian Goff
5fd0563505
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
2015-07-01 13:22:03 -04:00
Alexander Morozov
be5e1498c3
Merge pull request #14134 from vdemeester/runconfig-test-coverage
...
Refactor and add tests coverage on package runconfig
2015-07-01 10:15:26 -07:00
Antonio Murdaca
88d32a6109
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 18:16:17 +02:00
Shishir Mahajan
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-07-01 12:14:01 -04:00
David Calavera
1d7a62d776
Merge pull request #14314 from sunyuan3/TestRmiBlank
...
Add the expected error verification for TestRmiBlank.
2015-07-01 09:09:56 -07:00
David Calavera
d02540a44a
Merge pull request #14305 from aboch/nwst
...
Import latest libnetwork
2015-07-01 09:07:40 -07:00
Matthieu Hauglustaine
0dadf11bec
Add unit tests for ParseEnvFile.
...
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:43:03 +02:00
Matthieu Hauglustaine
e848494017
Return bufio error if set in ParseEnvFile
...
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.
Fixes : #14266
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:17:48 +02:00
Yuan Sun
2179dd00dd
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-01 19:34:43 +08:00
Vincent Demeester
d4aec5f0a6
Refactor test and add coverage to runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-01 10:16:36 +02:00