Commit Graph

10791 Commits

Author SHA1 Message Date
d50b0e2424 Merge pull request #8246 from brahmaroutu/doc_resize_tty_7840
Documenting Container Tty resize api
Upstream-commit: 6fec88f0b3eb8b68f605c0be8809fd86c16e9c3b
Component: engine
2014-09-29 12:29:32 -04:00
73dd429d26 Merge pull request #8255 from rhatdan/execman
docker-exec man page is not created.
Upstream-commit: a9e31285b51983e1439f14a68cf46c261a5ac250
Component: engine
2014-09-29 12:20:14 -04:00
ffcbd2813b Merge pull request #8260 from cpuguy83/8259_fix_bindmount_symlink_reuse
Fix #8259 - Can't reuse symlink'd bindmount
Upstream-commit: d142b18aab2a3b90959a2ab32676b388a5e98769
Component: engine
2014-09-26 16:37:56 -07:00
e55f8da518 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)
Upstream-commit: 882223c0f8a55c2011277aba08f1487a2930c075
Component: engine
2014-09-26 14:36:44 -04:00
acaefc427a Merge pull request #8233 from tiborvass/pr-7658
Fix Interactive container hangs when redirecting stdout
Upstream-commit: 0bb5f987315a51ef39f5fb070bff03c2849d059d
Component: engine
2014-09-26 11:31:29 -07:00
2fae7f4db3 Merge pull request #8254 from unclejack/bump_go_to_1.3.2
bump Go to 1.3.2
Upstream-commit: bef8bad9d17921042bb0f8a2cf721d0098e72818
Component: engine
2014-09-26 10:34:19 -07:00
de785f1386 Documenting Container Tty resize api
Addresses #7840

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: c7f3fdc629dd654af2fc795c1f3fa1acdaf2552f
Component: engine
2014-09-26 16:26:21 +00:00
07bda71556 Merge pull request #8224 from cpuguy83/7843_fix_start_attach_error_hang
Fix #7843 start -a can cause frozen term
Upstream-commit: 07da2e03b14c91f464f9fdfdbe8848ae8fc3725e
Component: engine
2014-09-26 11:54:39 -04:00
a47e9ab2de 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)
Upstream-commit: 9ae9d7db574083ce6233b33e8b0bbefb219d7fe6
Component: engine
2014-09-26 11:31:02 -04:00
821f6c28bc 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)
Upstream-commit: 0a8fb80d99e41f2d8d05f593fd77018e26f4ee2c
Component: engine
2014-09-26 09:31:59 -04:00
2027073c30 bump Go to 1.3.2
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 0f15221240b078c53e86c653c4098bf66e9e30ac
Component: engine
2014-09-26 12:48:28 +03:00
09f4c70017 Merge pull request #8252 from SvenDowideit/sven-oct-2014-pto
comment out my MAINTAINER line: Gone Camping
Upstream-commit: 3151ecd7bb99b473fe0dfb4c259080d6867c632c
Component: engine
2014-09-25 23:46:26 -07:00
dc75eee5a7 Gone Camping
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: afacaba79bc17641858a16bb265c63006a23a8d6
Component: engine
2014-09-26 14:28:39 +10:00
38bdca26a3 Merge pull request #8209 from brahmaroutu/doc_dockerignore_7724
Adding details on how to use .dockerignore file
Upstream-commit: 6df533adb45c50757311e2a6fa11e6344c194ab0
Component: engine
2014-09-26 10:53:36 +10:00
36fe58d4f6 Merge pull request #8237 from dmcgowan/tarsum_buffer_fix
tarsum: fix panic with dynamic buffer
Upstream-commit: f721075283d77edd0fe34b67f1da97e57602abe5
Component: engine
2014-09-25 16:22:02 -07:00
68ee1285e5 Merge pull request #8247 from aluzzardi/f-run-hostconfig
API: Provide the HostConfig during "run".
Upstream-commit: 0dfee56ca48b82639b684a7cf1243d5f4fd3f4f7
Component: engine
2014-09-25 16:09:55 -07:00
3443a67be3 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)
Upstream-commit: 5cdf7f507771e159ddd335f3757cd33f7ba4e426
Component: engine
2014-09-25 15:58:35 -07:00
5a623782b5 Merge pull request #8191 from vieux/improve_error_exec_lxc
Improve error for docker exec & LXC
Upstream-commit: 0913009ebee670d5eb0f585cd8dffcb59f873bce
Component: engine
2014-09-25 15:58:21 -07:00
8b12ac14d7 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>
Upstream-commit: 1df87b95066198c30312147393c18e0be0564fd0
Component: engine
2014-09-25 15:24:38 -07:00
ce11ad2451 Merge pull request #8241 from vbatts/vbatts-devmapper_version
devmapper: include the version in `info`
Upstream-commit: 1d8c66347eeea164d900dd16006109814dc3c261
Component: engine
2014-09-25 14:53:43 -07:00
a9f3287fa1 Merge pull request #8239 from erikh/hack_options
hack: TIMEOUT (for controlling test timeout) and forwarding of BUILDFLAGS to binary/dynbinary.
Upstream-commit: 993033d67ad5d2d9d4981708d7388694c3ecc8af
Component: engine
2014-09-25 14:36:00 -07:00
6099ab0109 Merge pull request #8243 from vieux/not_not
not not -> not
Upstream-commit: 1156314589ce0991be8db1e87b0ba6a9e05cafcb
Component: engine
2014-09-25 14:35:26 -07:00
449c9e0d74 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)
Upstream-commit: aa129b356ff9f16409cba25e9f16805923970cad
Component: engine
2014-09-25 14:25:43 -07:00
970c1210cf not not -> not
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: d19d800898a48aebf90947ced17157e26e3803e2
Component: engine
2014-09-25 21:23:27 +00:00
6e9ab87c7d devmapper: include the version in info
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 5630d466b28283c4d52ecfa5859a67112e8ccaa4
Component: engine
2014-09-25 15:51:02 -04:00
ac88033623 Adding details on how to use .dockerignore file
Addresses #7724

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: d7725ececab8f948356342a032be2f6b370560f5
Component: engine
2014-09-25 12:48:17 -07:00
001f52b09b Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id
Pull all image aliases for id
Upstream-commit: 1379c6ec504f348454796b0ac1d46025c183bb4e
Component: engine
2014-09-25 15:22:46 -04:00
326b4331c6 Merge pull request #8228 from SvenDowideit/latest-commandline-doc-changes
Updated output from the docker cli help
Upstream-commit: d024a6a316e07603a1f12df4a97dcd9bb0344e07
Component: engine
2014-09-25 12:03:10 -07:00
1375b67b05 Add DockerCli tests
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 29a62ceefc62836cc918093b60aef6b23a649d76
Component: engine
2014-09-25 20:58:43 +02:00
e3880837c4 DockerCli: Check IsTerminal() for both STDIN and STDOUT
`docker events > /tmp/out` should not print control
characters to non-terminal STDOUT.

This addresses commit 26b4a4920adca614f6be17a96f254f331271faf0
without creating regression described in issue #6509.

Signed-off-by: Vojtech Vitek (V-Teq) <vvitek@redhat.com>
Upstream-commit: d742c57f534352b6cad596d0c9fe8cf84044e92a
Component: engine
2014-09-25 20:58:24 +02:00
7190b42086 Merge pull request #8235 from duglin/Issue2515
Add checks for app/json - issue #2515
Upstream-commit: e2728d98926bb8921610f7ce2e5e4401623ae33c
Component: engine
2014-09-25 11:56:31 -07:00
4092cbb7ff Pull all image aliases for id. Closes #8141.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d74be162c9704df848c865a9b4bcd4047da9124
Component: engine
2014-09-25 11:48:49 -07:00
8be9986ecc Merge pull request #8208 from estesp/7851-fix-hostname-fqdn
Provide full hostname with domainname to underlying container layer
Upstream-commit: 857b739e29be658dd08974cd81752257b1d6f386
Component: engine
2014-09-25 11:33:50 -07:00
5dfb514311 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>
Upstream-commit: 40c7b53791b598364ffe2290c88875e4fc65be11
Component: engine
2014-09-25 20:14:25 +02:00
d851131502 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.
Upstream-commit: d369612b416484301e172bfae3fc692e9c176faf
Component: engine
2014-09-25 12:45:48 -04:00
cdd6c2350b 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)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
2014-09-25 09:44:19 -07:00
f5181e9a50 Add checks for app/json - issue #2515
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: e2b8d4bd4a77426b555bb1e6f57fc27f04f6c84b
Component: engine
2014-09-25 08:54:48 -07:00
113374480e 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)
Upstream-commit: 5239ba3d06b2efccd986231a93e839d4693d2d0c
Component: engine
2014-09-25 09:23:39 -04:00
46317f724f Updated output from the docker cli help
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: cb6b196ab470dad0ced37e20f525758625e488cb
Component: engine
2014-09-25 16:07:55 +10:00
2dae619626 Merge pull request #8205 from sequenceiq/master
Fix code example formatting in best-practices article
Upstream-commit: 4547b6d529df10d83ffc1937abc260c8a2ede743
Component: engine
2014-09-25 12:34:36 +10:00
f81a996837 Merge pull request #8212 from hugoduncan/patch-1
Fix quoting of TESTFLAGS in devenvironment.md
Upstream-commit: 243134563903c45b48784856b09ee0c377da82d7
Component: engine
2014-09-25 12:34:12 +10:00
fce5f6490a Merge pull request #8195 from tiborvass/migrate-get.docker.io
Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Upstream-commit: 3fa0ed01425dc6facb85a00338ddf99ed74a86be
Component: engine
2014-09-24 19:06:09 -04:00
8a28fc553b Replace get.docker.io -> get.docker.com and test.docker.io -> test.docker.com
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 808257654a4147ad9b54cfeddc5d0ad236c26e3f
Component: engine
2014-09-24 18:53:27 -04:00
ad7640867a Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test
Rewrite more fixtures test to not use fixtures.
Upstream-commit: a9368422081a6cbe8b0a77b506bd9684d61c7876
Component: engine
2014-09-24 15:07:03 -07:00
eef9fcd7bb Merge pull request #8200 from aluzzardi/f-ipallocator-check-range
IPAllocator: Ensure the allocated IPs are within network range.
Upstream-commit: 4479d69d562e707ed9b349290ba137904aa7123f
Component: engine
2014-09-24 14:29:39 -07:00
500b118084 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>
Upstream-commit: a471eb4d9388dc44be0a9c81fa2f15061df636c5
Component: engine
2014-09-24 11:04:28 -07:00
8f469a064b Merge pull request #8173 from crosbymichael/update-mem-limit
Update memory limit for container
Upstream-commit: f2fad5c2901240cb1b9e3e5747b0334a5b383978
Component: engine
2014-09-24 20:55:25 +03:00
fb8fce0378 Fix quoting of TESTFLAGS in devenvironment.md
Copy and pasting the example should now work, rather than TESTFLAGS being silently ignored.
Upstream-commit: 7aa88a4ff66aa0c256dc15e5e5a4ddda34ed0f46
Component: engine
2014-09-24 13:30:39 -04:00
18d0423bae Merge pull request #8182 from LK4D4/logjson_benchmark
pkg/logjson benchmark and test
Upstream-commit: 75ecfdd63cf4d45c87011e0bc300f2638c3866e2
Component: engine
2014-09-24 10:00:22 -07:00
32980488fe Rewrite TestContextTar tests to not use fixtures
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d302d9296125d2c7abf4adf992fd6739a19d5fbd
Component: engine
2014-09-24 17:09:18 +04:00