James Turnbull
1dae56c893
Merge pull request #8245 from filbranden/patch-1
...
Update google.md to point to latest container-vm version
2014-09-29 14:30:24 -04:00
Erik Hollensbe
1cd6135972
Merge pull request #8230 from duglin/Issue6820
...
add wildcard support to COPY/ADD (part 2 of issue #6820 )
2014-09-29 11:19:01 -07:00
Victor Vieux
22bd54be4a
Merge pull request #8276 from dqminh/8262-validate-build-tag
...
Fix #8262 : check tag's validity before building.
2014-09-29 10:57:54 -07:00
Michael Crosby
74dbea81d6
Merge pull request #8175 from hqhq/master
...
graph: add VirtualSize for inspect output
2014-09-29 10:50:28 -07:00
Vincent Batts
dab061bb64
Merge pull request #8282 from proppy/patch-10
...
api/server/MAINTAINERS: back from vacation
2014-09-29 13:12:06 -04:00
Johan Euphrosine
8019eec681
api/server/MAINTAINERS: back from vacation
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-09-29 10:03:07 -07:00
Erik Hollensbe
27c5269b4e
Merge pull request #8274 from tianon/parallel-shellshock
...
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
2014-09-29 09:34:36 -07:00
James Turnbull
6fec88f0b3
Merge pull request #8246 from brahmaroutu/doc_resize_tty_7840
...
Documenting Container Tty resize api
2014-09-29 12:29:32 -04:00
James Turnbull
a9e31285b5
Merge pull request #8255 from rhatdan/execman
...
docker-exec man page is not created.
2014-09-29 12:20:14 -04:00
Daniel, Dao Quang Minh
8833d800bf
check tag's validity before building.
...
When user passes an invalid tag to `docker build`
(i.e. `docker build -t abcd:A0123456789B0123456789C0123456789 .`), check the
tag first and terminate-early so user can specify the tag again
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-09-29 06:21:54 -04:00
Tianon Gravi
8ffdf6022e
Move the body of go_compile_test_dir into a file since GNU Parallel breaks on sourcing exported Bash functions thanks to the shellshock fixes
...
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-28 21:51:44 -06:00
Michael Crosby
d142b18aab
Merge pull request #8260 from cpuguy83/8259_fix_bindmount_symlink_reuse
...
Fix #8259 - Can't reuse symlink'd bindmount
2014-09-26 16:37:56 -07:00
Brian Goff
882223c0f8
Fix #8259 - Can't reuse symlink'd bindmount
...
volumes.Get was not checking for symlinked paths meanwhile when adding a
new volume it was following the symlink.
So when trying to use a bind-mount that is a symlink, the volume is
added with the correct path, but when another container tries to use the
same volume it got a "Volume exists" error because volumes.Get returned
nil and as such attempted to create a new volume.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-26 14:36:44 -04:00
Michael Crosby
0bb5f98731
Merge pull request #8233 from tiborvass/pr-7658
...
Fix Interactive container hangs when redirecting stdout
2014-09-26 11:31:29 -07:00
Victor Vieux
bef8bad9d1
Merge pull request #8254 from unclejack/bump_go_to_1.3.2
...
bump Go to 1.3.2
2014-09-26 10:34:19 -07:00
Srini Brahmaroutu
c7f3fdc629
Documenting Container Tty resize api
...
Addresses #7840
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-09-26 16:26:21 +00:00
Tibor Vass
07da2e03b1
Merge pull request #8224 from cpuguy83/7843_fix_start_attach_error_hang
...
Fix #7843 start -a can cause frozen term
2014-09-26 11:54:39 -04:00
Brian Goff
9ae9d7db57
Fix #7843
...
When doing `docker start -a` on a container that won't start, terminal
was getting stuck on the attach, even after container removal.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-26 11:31:02 -04:00
Dan Walsh
0a8fb80d99
docker-exec man page is not created.
...
docker-exec.md needs to be renamed in order to build man page.
Should be docker-exec.1.md
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2014-09-26 09:31:59 -04:00
unclejack
0f15221240
bump Go to 1.3.2
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-26 12:48:28 +03:00
James Turnbull
3151ecd7bb
Merge pull request #8252 from SvenDowideit/sven-oct-2014-pto
...
comment out my MAINTAINER line: Gone Camping
2014-09-25 23:46:26 -07:00
Sven Dowideit
afacaba79b
Gone Camping
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-26 14:28:39 +10:00
Doug Davis
acd40d5079
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-25 20:44:51 -07:00
Sven Dowideit
6df533adb4
Merge pull request #8209 from brahmaroutu/doc_dockerignore_7724
...
Adding details on how to use .dockerignore file
2014-09-26 10:53:36 +10:00
Victor Vieux
f721075283
Merge pull request #8237 from dmcgowan/tarsum_buffer_fix
...
tarsum: fix panic with dynamic buffer
2014-09-25 16:22:02 -07:00
Jessie Frazelle
0dfee56ca4
Merge pull request #8247 from aluzzardi/f-run-hostconfig
...
API: Provide the HostConfig during "run".
2014-09-25 16:09:55 -07:00
Derek McGowan
5cdf7f5077
pkg/tarsum: fix panic with dynamic buffer
...
When read is called on a tarsum with a two different read sizes, specifically the second call larger than the first, the dynamic buffer does not get reallocated causing a slice read error.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2014-09-25 15:58:35 -07:00
Victor Vieux
0913009ebe
Merge pull request #8191 from vieux/improve_error_exec_lxc
...
Improve error for docker exec & LXC
2014-09-25 15:58:21 -07:00
Andrea Luzzardi
1df87b9506
API: Provide the HostConfig during "run".
...
Currently, the HostConfig is only passed from the CLI to Docker only
when issuing a docker create, but not when doing a docker run.
In the near future, in order to allocate ports at creation time rather
than start time, we will need to have the HostConfig readily available
at container creation.
This PR makes the client always pass the HostConfig when creating a
container (regardless of whether it's for a run or create).
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-09-25 15:24:38 -07:00
Filipe Brandenburger
7c22b3d599
Update google.md to point to latest container-vm version
...
In order to match the version listed here:
https://cloud.google.com/compute/docs/containers/container_vms#starting_a_bare_container-vm_instance
2014-09-25 15:19:59 -07:00
Jessie Frazelle
1d8c66347e
Merge pull request #8241 from vbatts/vbatts-devmapper_version
...
devmapper: include the version in `info`
2014-09-25 14:53:43 -07:00
Erik Hollensbe
993033d67a
Merge pull request #8239 from erikh/hack_options
...
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
2014-09-25 14:36:00 -07:00
Jessie Frazelle
1156314589
Merge pull request #8243 from vieux/not_not
...
not not -> not
2014-09-25 14:35:26 -07:00
Erik Hollensbe
aa129b356f
hack: TIMEOUT (for controlling test timeout) and forwarding of
...
BUILDFLAGS to binary/dynbinary.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-25 14:25:43 -07:00
Victor Vieux
d19d800898
not not -> not
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-09-25 21:23:27 +00:00
Vincent Batts
5630d466b2
devmapper: include the version in `info`
...
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-25 15:51:02 -04:00
Srini Brahmaroutu
d7725ececa
Adding details on how to use .dockerignore file
...
Addresses #7724
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-09-25 12:48:17 -07:00
Tibor Vass
1379c6ec50
Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id
...
Pull all image aliases for id
2014-09-25 15:22:46 -04:00
Fred Lifton
d024a6a316
Merge pull request #8228 from SvenDowideit/latest-commandline-doc-changes
...
Updated output from the docker cli help
2014-09-25 12:03:10 -07:00
Tibor Vass
29a62ceefc
Add DockerCli tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-25 20:58:43 +02:00
Vojtech Vitek (V-Teq)
d742c57f53
DockerCli: Check IsTerminal() for both STDIN and STDOUT
...
`docker events > /tmp/out` should not print control
characters to non-terminal STDOUT.
This addresses commit 26b4a4920a
without creating regression described in issue #6509 .
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
2014-09-25 20:58:24 +02:00
Victor Vieux
e2728d9892
Merge pull request #8235 from duglin/Issue2515
...
Add checks for app/json - issue #2515
2014-09-25 11:56:31 -07:00
Jessica Frazelle
7d74be162c
Pull all image aliases for id. Closes #8141 .
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-25 11:48:49 -07:00
Victor Vieux
857b739e29
Merge pull request #8208 from estesp/7851-fix-hostname-fqdn
...
Provide full hostname with domainname to underlying container layer
2014-09-25 11:33:50 -07:00
Vojtech Vitek (V-Teq)
40c7b53791
Fix #6509 : Interactive container hangs when redirecting stdout
...
Cli IsTerminal() SYS_IOCTL operation should be determined from STDIN,
not from STDOUT.
Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
2014-09-25 20:14:25 +02:00
Tibor Vass
d369612b41
Merge pull request #7994 from erikh/parser_fix_volume_parsing
...
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
2014-09-25 12:45:48 -04:00
Erik Hollensbe
a5ca549a18
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-25 09:44:19 -07:00
Doug Davis
e2b8d4bd4a
Add checks for app/json - issue #2515
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-25 08:54:48 -07:00
Phil Estes
5239ba3d06
Provide full hostname with domainname to underlying container layer
...
Addresses #7851
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-25 09:23:39 -04:00
SvenDowideit
cb6b196ab4
Updated output from the docker cli help
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-09-25 16:07:55 +10:00