d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
4e3c72a026
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
2015-03-23 16:42:46 -07:00
92f9e2d395
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
2015-03-23 18:27:29 -05:00
197a3f0a98
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
2015-03-23 15:38:51 -07:00
3b4ff1c132
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
2015-03-23 15:20:39 -07:00
bfc748221b
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-23 15:16:13 -07:00
664ef0cbe2
Cleanup redundant else statements find via golint #11602
...
Signed-off-by: George MacRorie <gmacr31@gmail.com>
2015-03-23 20:40:29 +00:00
8b02d85e17
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 20:58:16 +01:00
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
85ab3c3b49
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
2015-03-23 11:21:16 -07:00
1fe55b2f8b
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
2015-03-23 10:43:02 -07:00
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
56acb1aac8
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
2015-03-23 09:59:40 -07:00
5daa9260bc
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-03-23 16:45:48 +00:00
d124197cc7
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-23 13:03:31 +01:00
a91b2431a3
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
2015-03-22 23:53:47 -07:00
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com>
2015-03-23 12:10:22 +08:00
ded0ada9b4
Merge pull request #11538 from duglin/EmptyVolume
...
Check volume path to make sure its not the empty string
2015-03-22 19:25:50 -07:00
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
33448ac3c9
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-03-22 17:56:05 -07:00
df389df990
Skip TestPullVerified because hello-world image cannot be verified
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-22 19:34:40 -04:00
671c12204c
Implement build cancellation
...
Add the capability to cancel the build by disconnecting the client.
This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.
This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.
* Add documentation of cancellation to cli and API
* Protect job cancellation with sync.Once
* Add TestBuildCancelationKillsSleep
* Add test case for build cancellation of RUN statements.
Signed-off-by: Peter Waller <p@pwaller.net>
2015-03-22 11:31:28 +00:00
28a34dfffd
integ-cli: fix bug and race in TestBuildSpaces
...
`TestBuildSpaces` is used to do string manipulation to redact timestamps
from compared cmd output. However it was assuming there is going to be
only one `time=".."` in the output --not the case on windows. Therefore
I wrote a regexp to redact all log timestamps.
Also the test used to have a copy/paste bug (see err1/err2). This fixes
that, too.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-21 19:43:14 +00:00
b7dc9040f0
Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles
...
Signed-off-by: Mitch Capper <mitch.capper@gmail.com>
2015-03-20 21:54:33 -07:00
8071bf3967
Check volume path to make sure its not the empty string
...
With this Dockerfile
```
FROM ubuntu
ENV ABC=""
VOLUME $ABC
```
It builds ok but then at run time I get this error:
FATA[0002] Error response from daemon: Cannot start container 8902b4a7aaf5c4e4b11a38070d392db465fa97ad88c91c8b38dda5ab8149ccac: [8] System error: no such file or directory
Because the Volume config shows "" as the path. This PR checks for "" as
the path and stops it at build time.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 21:39:49 -07:00
6d66e3e7a5
Fix some escaping around env var processing
...
Clarify in the docs that ENV is not recursive
Closes #10391
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 20:09:00 -07:00
e3e6f8e859
Merge pull request #11531 from vishh/parent-cgroup
...
Remove debug log line from cgroup-parent feature e2e test.
2015-03-20 20:30:01 -04:00
84d3ab30d4
Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode
...
Fix hostname missing when a container's net mode is contaienr mode
2015-03-20 16:49:37 -07:00
a7639c2e1f
Remove debug log line from cgroup-parent feature e2e test.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-20 23:25:34 +00:00
c536e5bfb4
Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
...
Add cli build warning about chmod bits on windows
2015-03-20 19:19:38 -04:00
41f2b010c6
Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets
...
cleanup unix sockets
2015-03-20 14:55:17 -07:00
4a8b3cad60
Add cli build warning about chmod bits on windows
...
This shows a warning message about adjusted file/directory permission bits
when the `docker build` cli command is executed on windows.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-20 20:13:32 +00:00
df8110519a
Merge pull request #11521 from duglin/AddLABELCacher
...
Add LABEL config check to runconfig compare
2015-03-20 13:52:13 -04:00
16309bef63
Add integration test for unix sock cleanup
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-20 12:34:35 -04:00
b4beb0637a
Add LABEL config check to runconfig compare
...
Without this we won't do a proper cacche check because we skip the
labels part of the config.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 05:55:48 -07:00
301bd57b1d
Ignore blank lines in getCgroupPaths
...
w/o this I would see:
```
unexpected file format for /proc/self/cgroup - ""
```
while running the cgroup tests
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-20 05:36:34 -07:00
385d4beaa5
Merge pull request #11512 from vishh/parent-cgroup
...
Update --cgroup-parent cli integration test to use "memory" cgroup instead of "cpu"
2015-03-19 21:28:59 -07:00
051bdf5c55
Merge pull request #11501 from duglin/TestLabels
...
Add a LABEL cache check testcase
2015-03-19 23:01:29 -04:00
97c573bf02
Add a LABEL cache check testcase
...
Thanks to @tiborvass's review of another PR it was noticed that
we didn't have a testcase to make sure the cache checking for LABEL
was being done properly. This adds a test for it.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-19 19:18:00 -07:00
49cb1a289f
Update --cgroup-parent cli integration test to use "memory" cgroup for detecting the test's
...
cgroups path instead of CPU.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-20 00:38:19 +00:00
5d90a8cc83
Merge pull request #11494 from sunyuan3/m2
...
add TestContainerRestartwithGoodContainer test case
2015-03-19 16:16:38 -07:00
455a272aef
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
2015-03-19 14:41:57 -07:00
9d5eab1873
Merge pull request #11453 from duglin/HideDaemonDots
...
Hide dots on daemon startup when loglevel != info
2015-03-19 10:10:18 -04:00
1339831906
add TestContainerRestartwithGoodContainer test case
...
Signed-off-by: s00318865 <sunyuan3@huawei.com>
2015-03-19 20:20:04 +08:00
74664dabff
Fix hostname missing when a container's net mode is contaienr mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-19 17:03:40 +08:00
c7267017e9
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2015-03-19 02:34:42 +00:00
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
e6ae89a45a
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-18 20:57:13 -04:00
8ec4e69839
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
2015-03-18 19:04:43 -04:00
c680dd9e5a
Fix duplicate display of dangling images
...
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
2015-03-18 10:41:01 -04:00
Jessie Frazelle
Michael Crosby
Tibor Vass
Alexander Morozov
Arnaud Porterie
George MacRorie
Antonio Murdaca
Srini Brahmaroutu
bobby abbott
Mabin
Tibor Vass
Peter Waller
Ahmet Alp Balkan
Mitch Capper
Doug Davis
Doug Davis
Vishnu Kannan
Tibor Vass
Brian Goff
Phil Estes
s00318865
Lei Jitang
Andy Goldstein