Commit Graph

1046 Commits

Author SHA1 Message Date
7074731d32 Merge pull request #11636 from robertabbott/refactor_networkfs
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
19aa69e7d8 Merge pull request #11667 from icecrime/integration-cli_image_cleanup
Cleanup "hello-world" image in build tests
Upstream-commit: 4e3c72a026f356508c3f530a15aa2dc09bcb27c9
Component: engine
2015-03-23 16:42:46 -07:00
925b84807a Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
#11602 - Cleanup redundant else statements find via golint 
Upstream-commit: 92f9e2d3955fcc3341407809c9db33ac702e1508
Component: engine
2015-03-23 18:27:29 -05:00
d10460e7af Merge pull request #11570 from runcom/9658-consistent-autoremove
Remove container if --rm flag is passed and container cannot be started
Upstream-commit: 197a3f0a98bbedc1253df3fae42837769871beb1
Component: engine
2015-03-23 15:38:51 -07:00
293d14edd7 Merge pull request #11264 from brahmaroutu/fixtest_10967
Test image api through local V1 repo, skip network test.
Upstream-commit: 3b4ff1c132669017f04d3b2e67517ff0c9a1a3df
Component: engine
2015-03-23 15:20:39 -07:00
b27a399633 Cleanup "hello-world" image in build tests
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bfc748221b15a0f6e42a6ab520ed6e31fa9e90c8
Component: engine
2015-03-23 15:16:13 -07:00
0221549820 Cleanup redundant else statements find via golint #11602
Signed-off-by: George MacRorie <gmacr31@gmail.com>
Upstream-commit: 664ef0cbe2113e8307135e656cc6db9199f8268e
Component: engine
2015-03-23 20:40:29 +00:00
9b9105b3b2 Remove hardcoded error
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 8b02d85e1728b48729b2fb8553b2ec4b56a30d37
Component: engine
2015-03-23 20:58:16 +01:00
69bd180001 Merge pull request #10431 from duglin/Issue10391
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
2015-03-23 13:30:11 -05:00
7dfdb9ea11 Merge pull request #11573 from icecrime/11572-restore_pull_test
Restore TestPullVerified test
Upstream-commit: 85ab3c3b49f902a3e0837e52ab3ce8fdfa2c8e5b
Component: engine
2015-03-23 11:21:16 -07:00
2ae5f5eb68 Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
Allow path from normal volume existing to overwrite in start Binds
Upstream-commit: 1fe55b2f8bc966c0784527b30f507cbc90325df7
Component: engine
2015-03-23 10:43:02 -07:00
2ed910fd38 Merge pull request #11406 from MabinGo/CmdStart_fix
Fix hanging up problem when start and attach multiple containers at once
Upstream-commit: bd952021613b26b7d8b8d078adda72d9ff6def00
Component: engine
2015-03-23 10:17:50 -07:00
950464de97 Merge pull request #11395 from mitchcapper/master
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
31ae66ceae Test image api through local V1 repo
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 5daa9260bcef2a47c493adc04e6638c9d200a9cf
Component: engine
2015-03-23 16:45:48 +00:00
2d5a6d9e9b Remove container if --rm flag is passed and container cannot be started
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: d124197cc726a3b69cc3cde8c4d560f3f0e1af9c
Component: engine
2015-03-23 13:03:31 +01:00
4b8e196164 Refactor pkg/networkfs
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
a1d0fa6752 Fix hanging up problem when start and attach multiple containers
Signed-off-by: Mabin <bin.ma@huawei.com>
Upstream-commit: 7dc1af146d24c346ac74c9dcb1df98f9ef51339d
Component: engine
2015-03-23 12:10:22 +08:00
9dcfa784ef Merge pull request #11538 from duglin/EmptyVolume
Check volume path to make sure its not the empty string
Upstream-commit: ded0ada9b47ab48b57d14225ec663e3756faff7f
Component: engine
2015-03-22 19:25:50 -07:00
088f0e2cb3 Merge pull request #9774 from pwaller/cancellation
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
67fed9c55e Restore TestPullVerified test
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 33448ac3c9c0c63fb07f7bf04cec998d3536fc10
Component: engine
2015-03-22 17:56:05 -07:00
503af64bfc Skip TestPullVerified because hello-world image cannot be verified
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: df389df9904dc1585160d7992c6f3dc150490e05
Component: engine
2015-03-22 19:34:40 -04:00
7c1bfa9093 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>
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
2015-03-22 11:31:28 +00:00
4a7e6e031f 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>
Upstream-commit: 28a34dfffdce359a5674cfda0a90b25b1f4d4d97
Component: engine
2015-03-21 19:43:14 +00:00
62b8050640 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>
Upstream-commit: b7dc9040f04fe8dacd2f14c6b93d1b0bb6bde333
Component: engine
2015-03-20 21:54:33 -07:00
bafff954ca 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>
Upstream-commit: 8071bf396747d3ad01db504a417b75fe7a52608a
Component: engine
2015-03-20 21:39:49 -07:00
490a18c994 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>
Upstream-commit: 6d66e3e7a5ecb021a9e89c4f85fadecf23e2000c
Component: engine
2015-03-20 20:09:00 -07:00
7d0cfe4c45 Merge pull request #11531 from vishh/parent-cgroup
Remove debug log line from cgroup-parent feature e2e test.
Upstream-commit: e3e6f8e85961f2e86cb328a7739f43285c7daefa
Component: engine
2015-03-20 20:30:01 -04:00
b2b558afeb Merge pull request #11492 from coolljt0725/fix_hostname_missing_in_container_netmode
Fix hostname missing when a container's net mode is contaienr mode
Upstream-commit: 84d3ab30d48a5194f7af93bccbd3b230b5115104
Component: engine
2015-03-20 16:49:37 -07:00
bbeee5cd0d Remove debug log line from cgroup-parent feature e2e test.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: a7639c2e1f377b1f5903bb6435473cba4db6522f
Component: engine
2015-03-20 23:25:34 +00:00
632e09a6f3 Merge pull request #11397 from ahmetalpbalkan/win-cli/build-warning
Add cli build warning about chmod bits on windows
Upstream-commit: c536e5bfb4e8f501ec27a9cc6d55b64d8f1a1603
Component: engine
2015-03-20 19:19:38 -04:00
5856180baf Merge pull request #11525 from cpuguy83/10969-cleanup-unix-sockets
cleanup unix sockets
Upstream-commit: 41f2b010c6ecf210253fe5a0e8f8b918cb8c534e
Component: engine
2015-03-20 14:55:17 -07:00
638765fe3b 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>
Upstream-commit: 4a8b3cad6096854027151dfbcfb4b2cd8841ad95
Component: engine
2015-03-20 20:13:32 +00:00
412e4a6c17 Merge pull request #11521 from duglin/AddLABELCacher
Add LABEL config check to runconfig compare
Upstream-commit: df8110519a3c40f7b5b98f977942973e4ccdc2e0
Component: engine
2015-03-20 13:52:13 -04:00
449ca606a0 Add integration test for unix sock cleanup
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 16309bef6395a50ee2871780b81caed8bc6c498e
Component: engine
2015-03-20 12:34:35 -04:00
1198ecb944 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>
Upstream-commit: b4beb0637a61c6002bb3b0b1dc150899db3b44e4
Component: engine
2015-03-20 05:55:48 -07:00
63456fafcf 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>
Upstream-commit: 301bd57b1d5ce78fe3e26f68c8f8f797abfbb5ca
Component: engine
2015-03-20 05:36:34 -07:00
f785f7c627 Merge pull request #11512 from vishh/parent-cgroup
Update --cgroup-parent cli integration test to use "memory" cgroup instead of "cpu"
Upstream-commit: 385d4beaa5060667f7b2ec51b16fef3f4830271c
Component: engine
2015-03-19 21:28:59 -07:00
6a2a2b2e20 Merge pull request #11501 from duglin/TestLabels
Add a LABEL cache check testcase
Upstream-commit: 051bdf5c55dcc9bbf6cd2a4b4babb432cdf8eb56
Component: engine
2015-03-19 23:01:29 -04:00
bab50b4201 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>
Upstream-commit: 97c573bf020e946fe1b9af61269f7f13f7f63f67
Component: engine
2015-03-19 19:18:00 -07:00
863c40a009 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)
Upstream-commit: 49cb1a289f19565132824e67bb83a2e255b13c8a
Component: engine
2015-03-20 00:38:19 +00:00
20a75ab782 Merge pull request #11494 from sunyuan3/m2
add TestContainerRestartwithGoodContainer test case
Upstream-commit: 5d90a8cc8382b5828eb8f7206a5f3480bd277e5a
Component: engine
2015-03-19 16:16:38 -07:00
a5bb86caaa Merge pull request #11428 from vishh/parent-cgroup
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
2015-03-19 14:41:57 -07:00
1d92cf5680 Merge pull request #11453 from duglin/HideDaemonDots
Hide dots on daemon startup when loglevel != info
Upstream-commit: 9d5eab18737adc82e3191c7708e5df540d0b485e
Component: engine
2015-03-19 10:10:18 -04:00
aa7fb83cec add TestContainerRestartwithGoodContainer test case
Signed-off-by: s00318865 <sunyuan3@huawei.com>
Upstream-commit: 133983190622bf2618df6c36fb77669e30458e17
Component: engine
2015-03-19 20:20:04 +08:00
f2ad0ab09b Fix hostname missing when a container's net mode is contaienr mode
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 74664dabff906f42b9acfbad516eeae484b47af9
Component: engine
2015-03-19 17:03:40 +08:00
b21852214d Adding integration tests for --cgroup-parent feature.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
2015-03-19 02:34:42 +00:00
793cdf14d1 Merge pull request #11410 from cpuguy83/10191_build_resources
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
2015-03-18 21:44:21 -04:00
5e80a64076 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>
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
2015-03-18 20:57:13 -04:00
47d9382364 Merge pull request #11430 from jfrazelle/export_outputflag
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
2015-03-18 19:04:43 -04:00
f8293aa682 Fix duplicate display of dangling images
Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: c680dd9e5adfe7255ac4499bff26bbb6edf7fe78
Component: engine
2015-03-18 10:41:01 -04:00