24545c18c3
builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 21:50:22 +00:00
4e74cd498b
builder: whitelist verbs useful for environment replacement.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:25 +00:00
be49867cab
builder: handle escapes without swallowing all of them.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-27 17:38:24 +00:00
350e1b783d
Merge pull request #8321 from erikh/ui_save_output
...
docker save: Do not save to a terminal.
2014-10-24 19:37:14 -04:00
c681bea062
Merge pull request #8744 from erikh/empty_entrypoint_inheritance
...
builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.
2014-10-24 15:31:15 -07:00
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
cdd6e97910
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)
2014-10-24 00:23:25 +00: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
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
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
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
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
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
47cb56f20f
Merge pull request #8691 from crosbymichael/fix-integration-race
...
Fix racy integration tests
2014-10-21 21:06:01 -04: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
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
cf44d6f9cc
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes
...
Clean volume paths
2014-10-21 11:17:03 -04: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
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
af52f8edcf
Merge pull request #8638 from LK4D4/fix_8632
...
Don't write pull output to stdout on container creating
2014-10-20 18:10:47 -04:00
52784c09b7
Merge pull request #8543 from brahmaroutu/filter_containers_7599
...
Adding capability to filter by name, id or status to list containers api
2014-10-20 15:04:24 -07:00
b90ab68f2a
Merge pull request #8511 from coolljt0725/fix_tag
...
Fix tag an existed tag name of a repository
2014-10-20 14:32:23 -07:00
1634625353
Adding capability to filter by name, id or status to list containers api
...
Closes #7599
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-10-20 18:33:20 +00:00
c496f24157
Add docker tag tests.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-10-20 11:10:31 +08:00
65edb07065
Return container exit code with start -a/-i
...
Addresses #8555
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2014-10-18 23:00:20 -04:00
c980fe09b7
Add a testcase to make sure we don't squash tabs or convert them to spaces
...
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one
Closes #2315
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-17 15:52:48 -07:00
75fd1b614d
Merge pull request #8639 from erikh/fix_escapes
...
builder: fix escaping for ENV variables.
2014-10-17 15:50:37 -07:00
df0e0c7683
builder: fix escaping for ENV variables.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-17 21:47:35 +00:00
3c325f89e5
Merge pull request #8415 from LK4D4/use_logs_in_builder
...
Use logs instead of attach for builder
2014-10-17 13:32:13 -07:00
6f09d064bd
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 13:20:02 -07:00
93d3c8e71d
Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
98e7608b4c
Rewrite TestBuildCopyDisallowRemote to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
c8a5d56fd7
Rewrite TestBuildCopyEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:48 -07:00
6582ea574c
Rewrite TestBuildCopyWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:30 -07:00
4a029259ff
Rewrite TestBuildCopyDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:07 -07:00
832618afc6
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:49 -07:00
24d83afd52
Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:28 -07:00
2248109ff8
Rewrite TestBuildCopySingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:01 -07:00
d41cba6aed
Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:34 -07:00
83c5dced10
Rewrite TestBuildCopySingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:04 -07:00
e45c92153d
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:54:29 -07:00
5a20dc67b0
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
2014-10-17 11:20:12 -07:00
09ceae5c9c
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
2014-10-17 11:11:49 -07:00
ad136e1ae3
Don't write pull output to stdout on container creating
...
Fixes #8632
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:08:53 -07:00
5af7facf18
Cleanup errorOut remove errorOut functions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
66ac7420a9
Cleanup errorOut resp run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
Erik Hollensbe
Tibor Vass
Alexandr Morozov
Jessie Frazelle
Victor Vieux
Srini Brahmaroutu
Phil Estes
Daniel, Dao Quang Minh
Jessica Frazelle
Michael Crosby
Michael Crosby
Brian Goff
Lei Jitang
Doug Davis
Alexandr Morozov