Brian Goff
135f5324b1
Merge pull request #15653 from albers/completion-log-opt-fix
...
[Fix 15246] bash completion fails on systems with bash 3.2
2015-08-18 12:37:56 -04:00
David Calavera
9f1e8eea8f
Merge pull request #15316 from icecrime/release_process
...
Documenting Docker release process
2015-08-18 09:33:44 -07:00
Sebastiaan van Stijn
d7ac3fa863
Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
...
Fixing docs to remove references to links under terms/
2015-08-18 18:27:28 +02:00
Sebastiaan van Stijn
3ce11c1587
Merge pull request #15656 from SvenDowideit/rename-public-hub
...
use the Docker Hub as the product name
2015-08-18 17:59:34 +02:00
Sebastiaan van Stijn
6947fbc2b0
Merge pull request #15657 from sallyom/man-inspect-typo
...
typo man-inspect
2015-08-18 17:37:58 +02:00
Brian Goff
9f8881b810
Merge pull request #15230 from azurezk/fix--rm-when-create-failure
...
--rm delete container when create failed
2015-08-18 11:32:33 -04:00
Sally O'Malley
df11b10680
typo man-inspect
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-08-18 11:19:57 -04:00
Sven Dowideit
30cde97e5c
use the Docker Hub as the product name
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-08-18 21:13:57 +10:00
Harald Albers
18381faee6
Fix bash completion for log driver options
...
This option was incorrectly ported to the new `daemon` subcommand
structure.
Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with
> bash: words: bad array subscript
Signed-off-by: Harald Albers <github@albersweb.de>
2015-08-18 09:17:29 +02:00
Zhang Kun
1ed15550f5
fix in daemon side
...
Signed-off-by: Zhang Kun <zkazure@gmail.com>
goformat
Signed-off-by: Zhang Kun <zkazure@gmail.com>
fix small
Signed-off-by: Zhang Kun <zkazure@gmail.com>
change to rm
Signed-off-by: Zhang Kun <zkazure@gmail.com>
handler other error
Signed-off-by: Zhang Kun <zkazure@gmail.com>
unique ERR
Signed-off-by: Zhang Kun <zkazure@gmail.com>
setHostConfig_fail_test
Signed-off-by: Zhang Kun <zkazure@gmail.com>
format
Signed-off-by: Zhang Kun <zkazure@gmail.com>
err handle and modify test
Signed-off-by: Zhang Kun <zkazure@gmail.com>
golint error
Signed-off-by: Zhang Kun <zkazure@gmail.com>
2015-08-18 10:06:36 +08:00
moxiegirl
66112a7ae5
Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
...
Update dev machine name to default in mac installation docs
2015-08-17 19:05:34 -07:00
Alexandre Beslic
f1da5edc8b
Merge pull request #15380 from calavera/remove_sys_info_pointers
...
Remove pointers from the SysInfo struct.
2015-08-17 18:40:54 -07:00
moxiegirl
5ab6883b92
Merge pull request #15430 from charleswhchan/patch-2
...
Cleanup "Working with containers" page.
2015-08-17 17:46:05 -07:00
Brian Goff
fd2e945d15
Merge pull request #15650 from LK4D4/fix_max_file_error
...
Fix error message in max-file validation
2015-08-17 20:27:12 -04:00
Brian Goff
1c916dbd83
Merge pull request #15632 from mountkin/fix-15626
...
a quick fix to #15626
2015-08-17 20:26:47 -04:00
Doug Davis
29ced5d0c4
Merge pull request #15599 from calavera/ps_format_q
...
Fix ignore `-q` flag in `docker ps` when there is a default format.
2015-08-17 15:44:28 -07:00
Alexander Morozov
cde607108b
Fix error message in max-file validation
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-08-17 15:34:39 -07:00
Brian Goff
5c88a6fdca
Merge pull request #15292 from mountkin/fix-exec-test
...
move the assertions outside of the goroutine
2015-08-17 17:24:58 -04:00
Alexander Morozov
aef15ffc5d
Merge pull request #15611 from mariussturm/master
...
Initialize LogConfig in daemon mode
2015-08-17 14:17:54 -07:00
David Calavera
436fca704f
Merge pull request #15356 from Microsoft/10662-uncpathonbuild
...
Windows: Allow UNC paths on build
2015-08-17 13:34:27 -07:00
John Howard
df7ab6f3db
Windows: Allow UNC paths on build
...
Signed-off-by: John Howard <jhoward@microsoft.com>
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-08-17 11:03:54 -07:00
Alexander Morozov
5aeb48af77
Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
...
Fix `inspect` output when no log driver specified
2015-08-17 11:03:37 -07:00
David Calavera
df46bfdd4d
Fix ignore `-q` flag in `docker ps` when there is a default format.
...
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-17 10:48:04 -07:00
David Calavera
2e7b088164
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
2015-08-17 10:45:48 -07:00
Brian Goff
2f2779b6a5
Fix `inspect` output when no log driver specified
...
Config options were being ignored in the inspect output when no driver
was specified.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-17 11:35:34 -04:00
Shijiang Wei
3977f30869
a quick fix to #15626
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-08-17 21:35:57 +08:00
Sebastiaan van Stijn
bba762b192
Merge pull request #15237 from charleswhchan/patch-3
...
Reformat /containers/(id)/resize to make it consistent with other sections.
2015-08-16 10:59:16 +02:00
Charles Chan
6cd2d89469
Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-15 19:47:01 -07:00
Sebastiaan van Stijn
e1f3a5ad0a
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
2015-08-16 00:20:41 +02:00
Michael Grauer
f26045a534
Update dev machine name to default in mac installation docs
...
Signed-off-by: Michael Grauer <michael.grauer@kitware.com>
2015-08-15 15:56:41 -04:00
Marius Sturm
e904cbec03
Initialize LogConfig in daemon mode
...
Signed-off-by: Marius Sturm <marius@graylog.com>
2015-08-15 18:06:03 +02:00
Charles Chan
2fcae333e8
Cleanup "Working with containers" page.
...
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-08-15 08:44:56 -07:00
Dharmit Shah
0a925d07a8
Fixing docs to remove references to links under terms/
...
Removed terms/ directory
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
2015-08-15 13:09:29 +05:30
Stefan J. Wernli
dfbb5520e3
Windows: Graph remove custom interface and add central store
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Windows: add support for images stored in alternate location.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
2015-08-14 23:45:53 -07:00
Brian Goff
a6e0a6852d
Merge pull request #15602 from Microsoft/10662-blockfromscratch
...
Windows: Block 'FROM scratch'
2015-08-14 21:12:15 -07:00
Arnaud Porterie
167783eb13
Merge pull request #15601 from mrjana/vendor18
...
Vendoring in vishvananda/netlink
2015-08-14 20:22:54 -07:00
Arnaud Porterie
bd9cc788d0
Merge pull request #15598 from cpuguy83/15570_fix_exec_tty
...
Fix issue with exec TTY caused by 15446
2015-08-14 19:43:04 -07:00
John Howard
6df6e2e405
Windows: Block 'FROM scratch'
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-14 18:17:19 -07:00
Jana Radhakrishnan
7948b755c7
Vendoring in vishvananda/netlink
...
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-08-14 18:02:58 -07:00
Sebastiaan van Stijn
837a66e79b
Merge pull request #15595 from estesp/build-experimental
...
Add info on how to build experimental binaries
2015-08-15 01:32:10 +02:00
Brian Goff
5ffcecf130
Fix issue with exec TTY caused by 15446
...
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-08-14 14:55:26 -07:00
moxiegirl
aedd45346a
Merge pull request #15428 from charleswhchan/patch-1
...
Improve/fix "Dockerizing Applications" page.
2015-08-14 14:03:11 -07:00
David Calavera
313b37129a
Merge pull request #15525 from albers/completion-option-updates
...
Updates to bash completion for docker run and docker daemon.
2015-08-14 13:55:11 -07:00
Phil Estes
3f8d60ac2f
Add info on how to build experimental binaries
...
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2015-08-14 16:45:38 -04:00
Jessie Frazelle
424fa59859
Merge pull request #15568 from Microsoft/10662-commitrunning
...
Windows: Stop commit on running container
2015-08-14 13:13:42 -07:00
Tibor Vass
3e523ae015
Merge pull request #14530 from Microsoft/10662-serversidevalidation
...
Windows: [TP3] Move netmode validation to server
2015-08-14 16:05:59 -04:00
John Howard
f6ed590596
Move netmode validation to server
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-14 12:17:41 -07:00
Tianon Gravi
53b1f993ab
Merge pull request #15580 from hqhq/hq_fix_NETPRIO_check
...
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
2015-08-14 12:03:03 -07:00
Alexander Morozov
d1fada4bf7
Merge pull request #15584 from mavenugo/ln-vendor-in
...
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
2015-08-14 11:56:47 -07:00
Sebastiaan van Stijn
f39323c1e3
Merge pull request #15519 from albers/changelog-dangling
...
[Fix 15518] wrong feature description in changelog
2015-08-14 20:48:48 +02:00