Commit Graph

20395 Commits

Author SHA1 Message Date
93029bdc4e Merge pull request #8325 from mwhudson/do-not-use-X
Stop using -X flag to set global variables
Upstream-commit: d515590d153ed1299ffe386eb30598c15bf61007
Component: engine
2014-10-24 17:30:45 -04:00
65068e254b Merge pull request #8746 from aluzzardi/bump-api-v1.16
Bump API to v1.16.
Upstream-commit: 78075abf81c45bfca16604919136eae99a2d7bff
Component: engine
2014-10-24 16:47:48 -04:00
5224a151c8 registry/endpoint: make it testable
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 3eba719400d5016aa0cbecbed1e222f810237b5b
Component: engine
2014-10-24 16:27:17 -04:00
462b389e50 Add back Best Practices link.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: fcae37402aac7372414fd4947b7a280bec398557
Component: engine
2014-10-24 13:17:14 -07:00
66e2b5cf0f Merge pull request #8760 from jfrazelle/8745-output-log
Client should use go log package.
Upstream-commit: 665cd10d59ee6ea54f64f5b8e4ca30d07f3afdb7
Component: engine
2014-10-24 13:13:30 -07:00
29e2118279 Merge pull request #8315 from dqminh/save-start-error
Save start error into State.Error when the container fails to start
Upstream-commit: 9094c19a6d69f5adf438463f6a3c19f5dad42bd9
Component: engine
2014-10-24 13:13:00 -07:00
4d1b4a2f11 Client should use go log package.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: a7aedca4a1afe72d63346b67b577437f175776b9
Component: engine
2014-10-24 13:03:46 -07:00
20fbd71b3d Tweaks to Dockerfile tutorial
Made a few tweaks to Dockerfile tutorial links and removed some cruft from the tutorial itself.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: cc45b13ad4e4384f016764c15a52eda95eb548a4
Component: engine
2014-10-24 12:00:47 -07:00
82b5bee9bb Bump API to v1.16.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
7c1ecdcafa archive: tests and benchmarks for hardlinks
Adding moar information, so benchmark comparisons can be moar
comparative.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0fdf7839a21390f5813589195639caf594a3ddc2
Component: engine
2014-10-24 08:58:31 -04:00
4391a7b5ae Document alternate command to check encrypted TCP socket
as curl command seems to fail on OSX Mavericks

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
Upstream-commit: ab03e898ff22e1bdb2452cfc2d9aad1313c97fc9
Component: engine
2014-10-24 09:15:15 +02:00
e7c0f6f001 dockerimages.md: typo fix
Upstream-commit: 417fde550e30e6e2b8853f73f6c85f25b9c6a80f
Component: engine
2014-10-24 09:09:20 +02:00
083e0d1a65 Add a link to some documentation about exec.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 7f1ea7129e7b87e60ea4b1e4449b0541f6f432c9
Component: engine
2014-10-24 12:41:19 +10:00
740280e4a3 Merge pull request #8722 from SvenDowideit/sven-cannot-bash
Add --dryrun to allow testing to the docs-release site, and then fix the...
Upstream-commit: c6f242b88f7a40d183a95ab68f2a97052ec514a5
Component: engine
2014-10-23 21:37:55 -04:00
a0bb629ead Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
Upstream-commit: 8f79bd964fa58124e0f3f4b1c1fdfef04f16a454
Component: engine
2014-10-23 21:37:36 -04:00
ff5f13dc15 Add --dryrun to allow testing to the docs-release site, and then fix the double dollar mistake
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 4bae6235c0aec3a0e3805b046a08fc7e6aadd46b
Component: engine
2014-10-24 11:36:07 +10:00
ecded68887 Merge pull request #8671 from shuai-z/master
Port number 49153(BeginPortRange) would be returned twice, causing dupli...
Upstream-commit: 0e6242122d9780709c057fc32e9970529c2e09fb
Component: engine
2014-10-23 17:37:38 -07:00
dc1bcb95a0 builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: cdd6e97910c50e5766c8bec2121f906e9ee2d119
Component: engine
2014-10-24 00:23:25 +00:00
ea99d5664f do not send hostconfig at start, as we do on create now
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 12028fc159c6c383b1b9e8810a7a41a7c6c985bc
Component: engine
2014-10-24 00:22:21 +00:00
f5318af0df Merge pull request #8737 from brahmaroutu/resize_uponstart_8728
Allowing resize tty to only work when container is started
Upstream-commit: a71b2ec54ad7b5f809176c023ab22c7e062ad909
Component: engine
2014-10-23 17:20:10 -07:00
2d4979cc75 Merge pull request #8453 from estesp/8444-create-bridge-error
Gracefully handle network bridge without IP association at startup
Upstream-commit: a76c924e6a23329569136bb8569168319f738656
Component: engine
2014-10-23 17:00:21 -07:00
e41a8afa7b finally, use code generation for INITSHA1 & INITPATH too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa
Component: engine
2014-10-24 11:01:19 +13:00
c15381784d use code generation for GITCOMMIT/VERSION too
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 85744a35de0e30c2dd6741b833f38ff218c8a3fc
Component: engine
2014-10-24 10:58:39 +13:00
4602c3289a Use code generation to set IAMSTATIC instead of -X
Signed-off-by: Michael Hudson-Doyle <michael.hudson@linaro.org>
Upstream-commit: 3e10b93106dea94e5747ab32fe4ac765aa22f9bc
Component: engine
2014-10-24 10:56:51 +13:00
d9b4e1dcc3 Allowing resize tty to only work when container is started
Addresses #8728

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 78a272ce14a43f81a79f1b948d5cfd120405f8c9
Component: engine
2014-10-23 21:31:34 +00:00
a6563fcbf3 Merge pull request #8736 from crosbymichael/update-libcontainer-oct3
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
Upstream-commit: 88e669391260900e48945c54ac74773b9b31816e
Component: engine
2014-10-23 14:07:36 -07:00
deaa163ba3 Gracefully handle network bridge without IP association at startup
Addresses #8444

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 1262b5f605e8f897acb2b9ee261edbab7f1f8947
Component: engine
2014-10-23 16:19:12 -04:00
546bdc45f6 Merge pull request #8735 from estesp/fix-test-timeout-on-drone
Up test timeout to 10s based on recent drone.io timeout failures
Upstream-commit: 77dcab133c784fa04cd61ddd73661624628be0bf
Component: engine
2014-10-23 13:02:34 -07:00
78bcad8438 Merge pull request #8733 from estesp/error-string-http-status-fix
Fix error string mapping to HTTP response code to ignore case
Upstream-commit: 45c511fd5a2f48d05763f7385c9fb6c2d9686f94
Component: engine
2014-10-23 12:10:21 -07:00
2fe580eb85 Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 291b84610fc87622c7116ac71328c1ce3181a6db
Component: engine
2014-10-23 19:00:05 +00:00
66fd2e972d Up test timeout to 10s based on recent drone.io timeout failures
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ee17b93df9ef2150d0ef25e077f1f87637a54508
Component: engine
2014-10-23 14:30:39 -04:00
6a65977701 Fix volume test using "find" to properly call find with /hello path
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6589044b5b84f82a71a756708b4a77b0bc49db42
Component: engine
2014-10-23 14:13:11 -04:00
6e22978e11 Replace fast with quickly
Technically an adverb should be used there :-)
Upstream-commit: 3a1eafb4889041be13f0e4e450b5eaf0ae7938c8
Component: engine
2014-10-23 11:06:36 -07:00
eb59f56bfa Removed James' email address
Changed email address for abuse reports from James to abuse@
Upstream-commit: 8b40d385b58f118cbda9f62da9cc88f91afd1f26
Component: engine
2014-10-23 10:54:40 -07:00
2a7b8eaaa5 Fix error string mapping to HTTP response code to ignore case
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9b430f4ec1083d2e73abe4269a85c8cdd91a5ade
Component: engine
2014-10-23 13:34:06 -04:00
4d888e5275 Merge pull request #8550 from aluzzardi/f-meminfo
system: Add MemInfo utility.
Upstream-commit: 1aa67071cb3e6bc8a08f662d913cdb1b1eda1645
Component: engine
2014-10-23 09:31:28 +03:00
b91a2b389f added test, gofmtd
Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: 2c2edabca5471fa969358cb98619f277d585e76c
Component: engine
2014-10-23 11:35:12 +08:00
79574eea31 Port number 49153(BeginPortRange) would be returned twice, causing duplication and potential errors.
If we first request port 49153 (BeginPortRange) explicitly, and later some time request the next free port (of same ip/proto) by calling RequestPort() with port number 0, we will again get 49153 returned, even if it's currently in use. Because findPort() blindly retured BeginPortRange the first run, without checking if it has already been taken.

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: 9451cf39eff037eccb04319c1e601d08495cab3c
Component: engine
2014-10-23 10:49:33 +08:00
98a7bd658b save start error into State.Error
when a container failed to start, saves the error message into State.Error so
that it can be retrieved when calling `docker inspect` instead of having to
look at the log

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: fb6ee865a949905f678aa7c7066c809664a8a4aa
Component: engine
2014-10-22 22:42:37 -04:00
4761e6734e Rewrite ENTRYPOINT documentation covering all the combinations with examples.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 0390d04d8a236c427f553ead4328f6b4947a61ef
Component: engine
2014-10-23 12:12:08 +10:00
1e8d742e05 Merge pull request #8718 from jfrazelle/run-redirect-test-fix
TestRunRedirectStdout kept failing with timed out.
Upstream-commit: 5343ede602aa032fce5ad0be4566047b7fd964db
Component: engine
2014-10-22 19:11:12 -07:00
f424039349 Merge pull request #8673 from SvenDowideit/whats-docker-version
DOCKER_VERSION and docker-version havn't been implemented.
Upstream-commit: bb3e33154d4be8779981ad74ca381be3cf57063f
Component: engine
2014-10-22 19:03:54 -07:00
cd84666875 TestRunRedirectStdout kept failing with timed out.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 93e17b2ecadc4a409fc55b1460bc2721a4345716
Component: engine
2014-10-22 15:51:14 -07:00
b7e17d56af Add MemInfo to the system pkg.
MemInfo provides a simple API to get memory information from the
system.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: e0c9d7b654221a0d4e5a310b0f9a0adb9ef69aa0
Component: engine
2014-10-22 14:05:45 -07:00
7e904deb7c Fix stdout premature EOF
Never close attached stream before both stdout and stderr have written
all their buffered contents. Remove stdinCloser because it is not needed
any more as the stream is closed anyway after attach has finished.

Fixes #3631

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: 5572dbb7504c951f4ddd2710a4037844a95caa6a
Component: engine
2014-10-22 16:34:42 -04:00
cb88e66803 Correct url from github.com/dotcloud/docker{,-py}
to github.com/docker/docker{,-py}

Signed-off-by: Torstein Husebø <torstein@huseboe.net>
Upstream-commit: 64cb7725381740986022eb4633c8f91be3dd7b4f
Component: engine
2014-10-22 16:57:39 +02:00
1e4822a1da Merge pull request #8672 from estesp/CmdRun-fix-typos-comments
Clean up comment sections and fix typos in CmdRun
Upstream-commit: 25c32d3167b13e52001d63690dcca23a70097372
Component: engine
2014-10-22 14:32:39 +03:00
875c76e70d Merge pull request #8692 from jfrazelle/8690-latest-tag-problem
Fix problem where building Dockerfile `FROM name:latest`
Upstream-commit: c694c66e2facc5194b225fa2bf4bca084cf7e5ee
Component: engine
2014-10-22 10:55:57 +03:00
dcf4a751ab Merge pull request #8682 from wpp/update_linking_documentation
Update linking documentation
Upstream-commit: 6aeda169957a4b6cabcdd8b3a163118b05af8434
Component: engine
2014-10-21 21:01:51 -07:00
d6e96092eb Merge pull request #8680 from wilsaj/patch-1
Docfix: fix cli dashes in boot2docker resizing article
Upstream-commit: a9258f78493b935dfeb6d86908b827786f5c9885
Component: engine
2014-10-21 21:00:53 -07:00