0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10786 commits 14 branches 412 tags 338 MiB
Commit graph

10786 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
Sven Dowideit
4547b6d529 Merge pull request #8205 from sequenceiq/master 
Fix code example formatting in best-practices article
 2014-09-25 12:34:36 +10:00
Sven Dowideit
2431345639 Merge pull request #8212 from hugoduncan/patch-1 
Fix quoting of TESTFLAGS in devenvironment.md
 2014-09-25 12:34:12 +10:00
Tibor Vass
3fa0ed0142 Merge pull request #8195 from tiborvass/migrate-get.docker.io 
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
 2014-09-24 19:06:09 -04:00
Tibor Vass
808257654a Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-24 18:53:27 -04:00
Victor Vieux
a936842208 Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test 
Rewrite more fixtures test to not use fixtures.
 2014-09-24 15:07:03 -07:00
Andrea Luzzardi
4479d69d56 Merge pull request #8200 from aluzzardi/f-ipallocator-check-range 
IPAllocator: Ensure the allocated IPs are within network range.
 2014-09-24 14:29:39 -07:00
Andrea Luzzardi
a471eb4d93 IPAllocator: Ensure the allocated IPs are within network range. 
Since it is possible to request a specific IP, IPAllocator has to verify
that the request is within boundaries.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2014-09-24 11:04:28 -07:00
unclejack
f2fad5c290 Merge pull request #8173 from crosbymichael/update-mem-limit 
Update memory limit for container
 2014-09-24 20:55:25 +03:00
Hugo Duncan
7aa88a4ff6 Fix quoting of TESTFLAGS in devenvironment.md 
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
 2014-09-24 13:30:39 -04:00
Victor Vieux
75ecfdd63c Merge pull request #8182 from LK4D4/logjson_benchmark 
pkg/logjson benchmark and test
 2014-09-24 10:00:22 -07:00
Alexandr Morozov
d302d92961 Rewrite TestContextTar tests to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:18 +04:00
Alexandr Morozov
51a56399f6 Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:14 +04:00
Alexandr Morozov
52cf331206 Rewrite TestBuildRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 13:15:55 +04:00
Lajos Papp
be4454c4f0 Fix code example formatting in best-practices article 
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com>
 2014-09-24 10:45:56 +02:00
Alexandr Morozov
ab4738b49f Rewrite TestBuildHistory to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 12:38:48 +04:00
Alexandr Morozov
1625cbfc4c Rewrite TestBuildForceRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 12:29:27 +04:00