0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14198 commits 14 branches 412 tags 338 MiB
Commit graph

1062 commits

Author SHA1 Message Date
Peter Choi
ae907e7af1 Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
 2015-03-26 15:05:45 -06:00
Michael Crosby
a196cc943c Merge pull request #11791 from moo-mou/11768-vetwarning 
Fix vet warning
 2015-03-26 10:52:07 -07:00
Doug Davis
389d0ae453 Fix TestBuildResourceConstraintsAreUsed Cpuset test 
Set cpuset to "0" so that it works on single core machines.
W/o this (and set to "1") we'll see something like this error
when running:
System error: write /cgroup/cpuset/docker/66689499bbd08cd8dccc9b7bfd1d6b34e85d73ce8c84d3c69b5e91944322da60/docker/79d7c548b58c85c4cfad6cd01eb7c3b30db254d1014c496137edd93ddc528a6f/cpuset.cpus: invalid argument"

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-26 07:31:39 -07:00
Jake Champlin
c2fe262439 Add fixes for integration-cli tests w/ --net none 
Adds network to integration tests that were failing without network.

Fixes #10964
Fixes #10968

Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com>
 2015-03-25 23:46:04 -04:00
paul
c5bf2145f1 Fix vet warning 
Signed-off-by: Paul Mou <ppymou@gmail.com>
 2015-03-25 20:31:02 -07:00
Doug Davis
a0cfe83435 Merge pull request #11751 from tiborvass/revert-validate-spaces 
Revert "Dealing with trailing whitespaces"
 2015-03-25 13:01:58 -04:00
Alexander Morozov
5f7e142c46 Merge pull request #11729 from icecrime/11048_carry 
Carry #11048
 2015-03-25 09:27:07 -07:00
Tibor Vass
0252ad0adc Revert "Dealing with trailing whitespaces" 
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319.

Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-03-25 10:04:56 -06:00
Alexander Morozov
f08e9f44a9 Merge pull request #11737 from duglin/FixTestOutput 
TestBuildCancelationKillsSleep sends exec cmd to stdout
 2015-03-25 08:45:09 -07:00
Jessica Frazelle
c959d26d2f fix 2 integration tests on lxc 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-24 21:12:16 -07:00
Doug Davis
fbd47969a8 TestBuildCancelationKillsSleep send exec cmd to stdout 
and makes the testing output ugly.

This hides the output since it not used.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-24 20:56:26 -07:00
Arnaud Porterie
8900ae2928 Revert all but TestPullImageFromCentralRegistry changes 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-24 16:27:35 -07:00
Michael Crosby
f3fc857e01 Merge pull request #11716 from LK4D4/root_in_run 
Use /var/run/docker as root for execdriver
 2015-03-24 14:58:30 -07:00
Alexander Morozov
1e788ec985 Use /var/run/docker as root for execdriver 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-24 10:47:30 -07:00
Antonio Murdaca
b80fae7356 Refactor pkg/common, Fixes #11599 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-24 18:19:59 +01:00
Jessie Frazelle
d5eea4e8b0 Merge pull request #11636 from robertabbott/refactor_networkfs 
Refactor pkg/networkfs
 2015-03-23 16:58:29 -07:00
Michael Crosby
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
Tibor Vass
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
Srini Brahmaroutu
5d70a97b1f Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none 
Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-03-23 22:53:04 +00:00
Alexander Morozov
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
Arnaud Porterie
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
Arnaud Porterie
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
George MacRorie
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
Antonio Murdaca
8b02d85e17 Remove hardcoded error 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
 2015-03-23 20:58:16 +01:00
Tibor Vass
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
Jessie Frazelle
85ab3c3b49 Merge pull request #11573 from icecrime/11572-restore_pull_test 
Restore TestPullVerified test
 2015-03-23 11:21:16 -07:00
Jessie Frazelle
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
Alexander Morozov
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
Jessie Frazelle
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
Srini Brahmaroutu
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
Antonio Murdaca
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
bobby abbott
a91b2431a3 Refactor pkg/networkfs 
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
 2015-03-22 23:53:47 -07:00
Mabin
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
Arnaud Porterie
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
Jessie Frazelle
45ee402a63 Merge pull request #9774 from pwaller/cancellation 
Add basic build cancellation
 2015-03-22 19:16:23 -07:00
Arnaud Porterie
33448ac3c9 Restore TestPullVerified test 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-22 17:56:05 -07:00
Tibor Vass
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
Peter Waller
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
Ahmet Alp Balkan
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
Mitch Capper
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
Doug Davis
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
Doug Davis
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
Doug Davis
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
Michael Crosby
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
Vishnu Kannan
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
Doug Davis
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
Jessie Frazelle
41f2b010c6 Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets 
cleanup unix sockets
 2015-03-20 14:55:17 -07:00
Ahmet Alp Balkan
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
Tibor Vass
df8110519a Merge pull request #11521 from duglin/AddLABELCacher 
Add LABEL config check to runconfig compare
 2015-03-20 13:52:13 -04:00
Brian Goff
16309bef63 Add integration test for unix sock cleanup 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-20 12:34:35 -04:00