9094c19a6d
Merge pull request #8315 from dqminh/save-start-error
...
Save start error into State.Error when the container fails to start
2014-10-24 13:13:00 -07:00
c6f242b88f
Merge pull request #8722 from SvenDowideit/sven-cannot-bash
...
Add --dryrun to allow testing to the docs-release site, and then fix the...
2014-10-23 21:37:55 -04:00
8f79bd964f
Merge pull request #8695 from SvenDowideit/add-details-to-entrypoint-docs
...
Rewrite ENTRYPOINT documentation covering all the combinations with exam...
2014-10-23 21:37:36 -04:00
4bae6235c0
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)
2014-10-24 11:36:07 +10:00
0e6242122d
Merge pull request #8671 from shuai-z/master
...
Port number 49153(BeginPortRange) would be returned twice, causing dupli...
2014-10-23 17:37:38 -07:00
a71b2ec54a
Merge pull request #8737 from brahmaroutu/resize_uponstart_8728
...
Allowing resize tty to only work when container is started
2014-10-23 17:20:10 -07:00
a76c924e6a
Merge pull request #8453 from estesp/8444-create-bridge-error
...
Gracefully handle network bridge without IP association at startup
2014-10-23 17:00:21 -07:00
78a272ce14
Allowing resize tty to only work when container is started
...
Addresses #8728
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-10-23 21:31:34 +00:00
88e6693912
Merge pull request #8736 from crosbymichael/update-libcontainer-oct3
...
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
2014-10-23 14:07:36 -07:00
1262b5f605
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)
2014-10-23 16:19:12 -04:00
77dcab133c
Merge pull request #8735 from estesp/fix-test-timeout-on-drone
...
Up test timeout to 10s based on recent drone.io timeout failures
2014-10-23 13:02:34 -07:00
45c511fd5a
Merge pull request #8733 from estesp/error-string-http-status-fix
...
Fix error string mapping to HTTP response code to ignore case
2014-10-23 12:10:21 -07:00
291b84610f
Update libcontainer to aab3f6d17f2f56606f07f3a6eb6
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-23 19:00:05 +00:00
ee17b93df9
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)
2014-10-23 14:30:39 -04:00
6589044b5b
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)
2014-10-23 14:13:11 -04:00
8b40d385b5
Removed James' email address
...
Changed email address for abuse reports from James to abuse@
2014-10-23 10:54:40 -07:00
9b430f4ec1
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)
2014-10-23 13:34:06 -04:00
1aa67071cb
Merge pull request #8550 from aluzzardi/f-meminfo
...
system: Add MemInfo utility.
2014-10-23 09:31:28 +03:00
2c2edabca5
added test, gofmtd
...
Signed-off-by: shuai-z <zs.broccoli@gmail.com>
2014-10-23 11:35:12 +08:00
9451cf39ef
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>
2014-10-23 10:49:33 +08:00
fb6ee865a9
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)
2014-10-22 22:42:37 -04:00
0390d04d8a
Rewrite ENTRYPOINT documentation covering all the combinations with examples.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-23 12:12:08 +10:00
5343ede602
Merge pull request #8718 from jfrazelle/run-redirect-test-fix
...
TestRunRedirectStdout kept failing with timed out.
2014-10-22 19:11:12 -07:00
bb3e33154d
Merge pull request #8673 from SvenDowideit/whats-docker-version
...
DOCKER_VERSION and docker-version havn't been implemented.
2014-10-22 19:03:54 -07:00
ba14ddf85b
Merge pull request #8708 from torstehu/fix-url
...
Correct url from github.com/dotcloud/docker{,-py}
2014-10-22 18:57:42 -04:00
93e17b2eca
TestRunRedirectStdout kept failing with timed out.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-22 15:51:14 -07:00
e0c9d7b654
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>
2014-10-22 14:05:45 -07:00
64cb772538
Correct url from github.com/dotcloud/docker{,-py}
...
to github.com/docker/docker{,-py}
Signed-off-by: Torstein Husebø <torstein@huseboe.net>
2014-10-22 16:57:39 +02:00
25c32d3167
Merge pull request #8672 from estesp/CmdRun-fix-typos-comments
...
Clean up comment sections and fix typos in CmdRun
2014-10-22 14:32:39 +03:00
c694c66e2f
Merge pull request #8692 from jfrazelle/8690-latest-tag-problem
...
Fix problem where building Dockerfile `FROM name:latest`
2014-10-22 10:55:57 +03:00
6aeda16995
Merge pull request #8682 from wpp/update_linking_documentation
...
Update linking documentation
2014-10-21 21:01:51 -07:00
a9258f7849
Merge pull request #8680 from wilsaj/patch-1
...
Docfix: fix cli dashes in boot2docker resizing article
2014-10-21 21:00:53 -07:00
ca500e0039
Merge pull request #8651 from flisky/patch-1
...
fix a small typo
2014-10-21 23:40:34 -04:00
6f4529a598
Merge pull request #8670 from SvenDowideit/link-to-run-reference-from-cli.md
...
Link to run reference from cli doc
2014-10-21 23:38:57 -04:00
47cb56f20f
Merge pull request #8691 from crosbymichael/fix-integration-race
...
Fix racy integration tests
2014-10-21 21:06:01 -04:00
373fd1ce16
Fixes #8690
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-21 16:47:43 -07:00
95d1cd0bde
Merge pull request #8661 from estesp/8555-start-exit-code
...
Return container exit code with start -a/-i
2014-10-21 16:22:15 -07:00
ba5370c116
Fix racy integration tests
...
Do not run containers in the background in the integration tests if you
depend on the run completing. It is better especially if you just want
to ensure that the run has completed with a `true` to just run in
foreground and use a known name for the container to query it after it
has stopped.
The failures can be reproduced on most machines by giving your dind
container one core and a cpushare.
docker run -c 200 --cpuset 0 -ti --rm --privileged -e
DOCKER_GRAPHDRIVER=vfs docker hack/make.sh binary test-integration-cli
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-21 22:51:09 +00:00
a07ee0db62
Merge pull request #8684 from erikh/onbuild_case_insensitive
...
builder: handle cases where onbuild is not uppercase.
2014-10-21 15:24:15 -07:00
a34831f016
builder: handle cases where onbuild is not uppercase.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-21 20:17:37 +00:00
5df2c878a1
Update container linking documentation
...
As of 1.3 `docker ps` no longer shows links between containers.
This updates the documentation to reflect that change.
sudo docker docker inspect -f "{{ .HostConfig.Links }}" web
Signed-off-by: Philipp Weissensteiner <mail@philippweissensteiner.com>
2014-10-21 21:58:05 +02:00
36dae27fa2
fix cli dashes in boot2docker resizing article
...
The CLI commands had long dashes that won't work on most terminals when copy pasting.
Signed-off-by: wilsaj <wilson.andrew.j+github@gmail.com>
2014-10-21 11:38:19 -05:00
9df3e45ba9
Merge pull request #8423 from unclejack/lint_changes
...
lint changes part 1
2014-10-21 12:15:58 -04:00
cf44d6f9cc
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes
...
Clean volume paths
2014-10-21 11:17:03 -04:00
6ed610fb80
DOCKER_VERSION and docker-version havn't been implemented.
...
So far, it looks like the declarations are not used, and so its safer not to
confuse people into thinking they do something.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-21 16:04:11 +10:00
9e137ceb57
Link to run reference from cli doc
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-10-21 11:21:11 +10:00
a10876d355
Merge pull request #8573 from estesp/integration-test-migrate
...
Migrate container GET API tests from integration to integration-cli
2014-10-20 18:06:40 -07:00
a0781f3ea9
Merge pull request #8509 from cpuguy83/make_copy_support_volumes
...
Make container.Copy support volumes
2014-10-20 17:34:30 -07:00
ef98fe0763
Make container.Copy support volumes
...
Fixes #1992
Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.
archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-20 20:23:01 -04:00
964f9965c7
Clean volume paths
...
Fixes #8659
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-20 19:07:56 -04:00
Jessie Frazelle
James Turnbull
Sven Dowideit
Michael Crosby
Victor Vieux
Andrea Luzzardi
Srini Brahmaroutu
Phil Estes
Alexandr Morozov
Michael Crosby
Fred Lifton
unclejack
shuai-z
Daniel, Dao Quang Minh
Sven Dowideit
Jessica Frazelle
Torstein Husebø
Tibor Vass
Erik Hollensbe
Philipp Weissensteiner
Andy Wilson
Brian Goff