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
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
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
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
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
ba92a9eabd
Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 51a56399f6384decee03a7e1aa56a3f46cb7c63f
Component: engine
2014-09-24 17:09:14 +04:00
beff003be9
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 52cf331206b9e50ba9b52f950b5a377179cf7aa5
Component: engine
2014-09-24 13:15:55 +04:00
65521dc5a1
Fix code example formatting in best-practices article
...
Signed-off-by: Lajos Papp <lajos.papp@sequenceiq.com >
Upstream-commit: be4454c4f0ba1a1d9fdd2f0ec7e631403ee61f63
Component: engine
2014-09-24 10:45:56 +02:00
a1e93ec56c
Rewrite TestBuildHistory to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: ab4738b49fa72b5ac1d5cc441f6e5bb4328a04c6
Component: engine
2014-09-24 12:38:48 +04:00
49a6b8858b
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
Upstream-commit: 1625cbfc4c02843ff0fbbf43bd46c13698609f2a
Component: engine
2014-09-24 12:29:27 +04:00
134a1a90ab
Merge pull request #8197 from fredlf/adding_official-repo-guidelines
...
Docs for Official Repo release
Upstream-commit: 8dd11c7175147d31761b647daac10fb18f0420c2
Component: engine
2014-09-23 20:55:07 -07:00
aeb0f3e4bc
Merge pull request #8157 from SvenDowideit/sshd-pam-fix
...
Fix for user kicked off after login on some hosts
Upstream-commit: f68f5fd521270ad9775fb0adfe7516f9e4855ba5
Component: engine
2014-09-23 20:42:27 -07:00
4e7f3a0260
Merge pull request #8178 from SvenDowideit/systemd-example-moved
...
That Systemd example URL isn't there anymore
Upstream-commit: a1609a7324c934ed4d151d75395173c1054f836b
Component: engine
2014-09-23 20:41:13 -07:00
82616b8c9e
Revisions and edits based on feedback.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 950eccab4ad4d79a5afa154849567ddfdf8dc7eb
Component: engine
2014-09-23 18:26:02 -07:00
7f18ab2efd
Merge pull request #7973 from LK4D4/persist_execdriver_dir
...
Persist execdriver dir
Upstream-commit: 827634d355bcbda3e75a05598022edf2262a2585
Component: engine
2014-09-23 16:01:03 -07:00
7f93986b70
Typo and formatting fixes. Copy edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6747dfc8031205f0e629a3508f14125b3b66a5b2
Component: engine
2014-09-23 15:51:17 -07:00
b69daeee17
Merge pull request #8192 from unclejack/lower_timeout_integ
...
integration: lower timeout for stop/restart tests
Upstream-commit: b12f3a6cca945f600f5aa35620b23e5aad5d8c6f
Component: engine
2014-09-23 18:46:58 -04:00
fd178d0d6f
integration: lower timeout for stop/restart tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6a5f09b752c32983472bd194fef1828a73c95203
Component: engine
2014-09-24 01:20:41 +03:00
3c0e9292e2
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
Upstream-commit: 81a643211bbd88545d21550defc9cd7e3f8437bd
Component: engine
2014-09-23 15:16:57 -07:00
0cb047b7d8
Merge pull request #8187 from erikh/builder_onbuild_output
...
builder: properly communicate onbuild trigger information during subsequent builds.
Upstream-commit: 27567e55937fded6601d4c6b1fcb82fdfcb4ce04
Component: engine
2014-09-23 18:04:59 -04:00
be3cb2a0ac
Improve error for docker exec & LXC
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: ab30e19b96ce498c8a7de748e197f12b5550a7b2
Component: engine
2014-09-23 21:47:33 +00:00
756d3489d5
Adding new Dockerfile Best Practices doc, and links thereto.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: d9fd5f6199aebb9ea784f5b23ec97b960f89f3d4
Component: engine
2014-09-23 14:21:00 -07:00
c65c43b413
Make sure COPY/ADD on dirs doesn't grab too many files
...
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd329d062bddaffcfea3ac0cd3245c0be5bf5542
Component: engine
2014-09-23 14:16:00 -07:00
e73a233371
builder: properly communicate onbuild trigger information during
...
subsequent builds.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org > (github: erikh)
Upstream-commit: 8edacc673a0ecb4320377457f0bf9dbdaa08f843
Component: engine
2014-09-23 13:55:51 -07:00
55f5c84e4a
Merge pull request #8101 from jfrazelle/6974-correct-ct-json-stream
...
Change content-type for json stream to application/x-json-stream.
Upstream-commit: 42ec80bec02b7cb921397fc79ca58a18190e2c4b
Component: engine
2014-09-23 11:24:31 -07:00
