Jessie Frazelle
d7626e97b6
Merge pull request #9188 from somaopensource/8777-fix
...
Fix for #8777 (continuing PR #9061 )
2014-11-21 17:57:56 -08:00
Vincent Batts
acdf766069
pkg/devicemapper: clarify TaskCreate and createTask
...
* Rename and expose createTask() to TaskCreateNamed()
* add comments
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-11-21 20:54:50 -05:00
Michael Crosby
fb1540199e
Merge pull request #9183 from vbatts/dm_udevwait
...
devmapper: Call UdevWait() even in failure path
2014-11-21 17:28:37 -08:00
Vincent Batts
104d27a07b
Merge pull request #9267 from crosbymichael/devmapper-mknod
...
Mknod more loopbacks for devmapper
2014-11-21 20:23:43 -05:00
Michael Crosby
e820365b67
Merge pull request #9086 from vbatts/vbatts-tarsum_more_tests
...
pkg/tarsum: adding more tests
2014-11-21 17:12:55 -08:00
Michael Crosby
496db275d5
Merge pull request #9185 from djmaze/patch-1
...
Fix link to MAINTAINERS.md in CONTRIBUTING.md
2014-11-21 16:40:27 -08:00
Michael Crosby
f8509e7940
Mknod more loopbacks for devmapper
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-21 16:20:35 -08:00
Martin Honermeyer
20218f3971
Fix link to MAINTAINERS.md in CONTRIBUTING.md
...
Signed-off-by: Martin Honermeyer <maze@strahlungsfrei.de>
2014-11-22 01:18:40 +01:00
unclejack
07b7bdb4fc
Merge pull request #9270 from jfrazelle/8919-tag-output
...
Output image with tag name when image is not found
2014-11-22 01:56:31 +02:00
Michael Crosby
c78bf8d86a
Merge pull request #9265 from vieux/daemon_labels
...
add daemon labels (displayed in docker info)
2014-11-21 15:14:27 -08:00
Tibor Vass
17ba356e9a
Merge pull request #9158 from tianon/minor-makefile-preamble-reorg
...
Add some minor reorganization to the Makefile preamble
2014-11-21 18:02:11 -05:00
Tianon Gravi
82f33d86a7
Add some minor reorganization to the Makefile preamble
...
The gist here is a reemphasizing of the explicitly "user mutable" bits by putting them first (and hopefully improving readability a little bit in the process).
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-11-21 15:49:09 -07:00
Sven Dowideit
44159f38d2
Merge pull request #9209 from SvenDowideit/shared-disk-space-images
...
If an image has more than one repo name or tag, it'll be listed more tha...
2014-11-21 14:07:45 -08:00
Vincent Batts
a43ee077dc
Merge pull request #9149 from swagiaal/fix-configureBridge-comment
...
Remove reference to 'ifaceName' from configureBridge comment.
2014-11-21 16:37:28 -05:00
Vincent Batts
a5277764ae
Merge pull request #9009 from a-ba/fix-export-repo
...
fix missing layers when exporting a full repository
2014-11-21 15:44:27 -05:00
Victor Vieux
62a7d75512
key=values -> key=value
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-21 19:15:22 +00:00
unclejack
054e57a622
build: add pull flag to force image pulling
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2014-11-21 19:59:44 +02:00
Alexander Morozov
0f2de5158f
Merge pull request #9261 from unclejack/fix_test_tmp_cleanup
...
fix cleanup of /tmp in tests
2014-11-21 08:48:04 -08:00
Arnaud Porterie
ce8ebaf0e0
Merge pull request #9225 from icecrime/win_make_binary
...
Adapt project/make.sh for Windows builds
2014-11-21 08:37:19 -08:00
unclejack
4180579313
graphdriver/aufs: fix tmp cleanup in tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-21 18:31:45 +02:00
Yohei Ueda
244af451e9
Use termios via CGO
...
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
2014-11-21 22:12:03 +09:00
Joel Friedly
2d2b3535ca
Fix typos in the user guide main page
...
Signed-off-by: Joel Friedly <joelfriedly@gmail.com>
2014-11-21 03:17:00 +00:00
Alexander Morozov
e3f3259e00
Merge pull request #9271 from jfrazelle/iptables-errors
...
Typed errors for iptables chain raw command output. YAYYYYYY.
2014-11-20 19:03:38 -08:00
Jessica Frazelle
f6c7194539
Apply same typed iptables errors to network driver.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-20 18:07:15 -08:00
Jessica Frazelle
6cc75574b3
Typed errors for iptables chain raw command output. YAYYYYYY.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-20 18:07:11 -08:00
Michael Crosby
532e502e9c
Merge pull request #9259 from duglin/Issue9221
...
Make --tlsverify enable tls regardless of value specified
2014-11-20 17:41:31 -08:00
Michael Crosby
5d67a3faea
Merge pull request #9248 from vbatts/vbatts-fix_gh9241
...
pkg/tarsum: actually init the TarSum struct
2014-11-20 17:15:15 -08:00
unclejack
5cde77d003
Merge pull request #9269 from crosbymichael/update-libcontainer-nov20
...
Update libcontainer to 84c1636580a356db88b079d118b94abe6a1a0acd
2014-11-21 02:50:04 +02:00
Doug Davis
ae9bd580af
Make --tlsverify enable tls regardless of value specified
...
I also needed to add a mflag.IsSet() function that allows you to check
to see if a certain flag was actually specified on the cmd line.
Per #9221 - also tweaked the docs to fix a typo.
Closes #9221
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-20 16:09:06 -08:00
Fred Lifton
29f4ea2cd5
Merge pull request #9220 from SvenDowideit/add-apache-foreground-eg
...
Add an example that shows starting apache in the foreground
2014-11-20 16:02:38 -08:00
Michael Crosby
c1a40d9279
Merge pull request #9228 from SvenDowideit/update-tlsverify-doc
...
tlsverify flag has no dash
2014-11-20 15:19:31 -08:00
Jessica Frazelle
e527be1f14
Fix tag output where image is not found.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-11-20 15:09:09 -08:00
Lei Jitang
7a7890950d
Fix create container output messages.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Signed-off-by: Jessica Frazelle <jess@docker.com>
2014-11-20 15:03:27 -08:00
Michael Crosby
56c3753631
Revert "Support hairpin NAT"
...
This reverts commit 95a400e6e1
.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-20 14:22:32 -08:00
Sven Dowideit
8d3b13bd7a
Add an example that shows starting apache in the foreground
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2014-11-20 14:21:05 -08:00
Michael Crosby
4acdb7ddc7
Merge pull request #9260 from LK4D4/increase_proxy_timeout
...
Increase timeout for userland proxy starting
2014-11-20 14:20:31 -08:00
Michael Crosby
f42176434a
Update libcontainer to 84c1636580a356db88b079d118b
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-11-20 14:19:24 -08:00
Michael Crosby
9a917e732c
Merge pull request #9174 from dqminh/docker-exec-env
...
Set correct env variables for `docker exec` commands
2014-11-20 13:31:51 -08:00
Michael Crosby
58b6f31a7a
Merge pull request #8251 from duglin/Issue2333
...
Add support for ENV of the form: ENV name=value ...
2014-11-20 13:12:24 -08:00
Victor Vieux
284cbda9ce
docs nits
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:54:03 +00:00
Victor Vieux
7ff3b81054
events filtering
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:46:48 +00:00
Victor Vieux
2fe36baa0a
add daemon labels
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 19:23:58 +00:00
Tibor Vass
998b591a71
Merge pull request #9201 from vieux/add_hostname_docker_info
...
Add hostname and ID docker info
2014-11-20 13:11:16 -05:00
Daniel, Dao Quang Minh
2bceaae423
test case for preserving env in exec session
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-11-20 13:05:37 -05:00
Dan Walsh
bce9ed0e4c
Allow developers to build docker with debuginfo included
...
If you execute
DEBUG=-g hack/make.sh dynbinary
Docker will be build with the debug info making it easier to use
cgdb or lightide to debug.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-11-20 12:59:50 -05:00
Doug Davis
1314e1586f
Add support for ENV of the form: ENV name=value ...
...
still supports the old form: ENV name value
Also, fixed an issue with the parser where it would ignore lines
at the end of the Dockerfile that ended with \
Closes #2333
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-11-20 09:54:28 -08:00
Victor Vieux
8ef36dcfe7
update docs
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 17:40:08 +00:00
Victor Vieux
227f4bbdb3
Hostname -> Name
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 17:40:08 +00:00
Victor Vieux
6e92dfdfd8
Update libtrust version
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-11-20 17:39:54 +00:00
unclejack
db7fded17f
integ-cli: fix cleanup in build tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-11-20 19:38:41 +02:00