Commit Graph

20395 Commits

Author SHA1 Message Date
2a8c716e73 Merge pull request #16650 from cpuguy83/no_named_volumes_for_builder
Do not parse config.Volumes for named volumes
Upstream-commit: ae03e544e78dd478c72021fa72fd91351553fba5
Component: engine
2015-09-29 17:04:29 -07:00
1fb74bb17c Separate API router from server.
Implement basic interfaces to write custom routers that can be plugged
to the server. Remove server coupling with the daemon.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: da982cf5511814b6897244ecaa9c016f8800340a
Component: engine
2015-09-29 19:43:03 -04:00
e5db2c0e2f Merge pull request #16659 from tiborvass/revert-context
Remove custom context package and use golang's only for api/server
Upstream-commit: 144abf2a58b9ad3ca4cb23b48e8a0b5e288962c3
Component: engine
2015-09-29 16:11:24 -07:00
eb95300866 Fix golint issues on the windows graph driver.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1fffc7a89dd69800317e881009188871906cce6a
Component: engine
2015-09-29 18:32:45 -04:00
a6a6684e96 Use golang.org/x/net/context in api/server/
This patch removes the internal context package and uses golang's
package instead.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 94e3b0f4288cdff767817b751e9a318e665ea7ac
Component: engine
2015-09-29 17:40:55 -04:00
ad77115889 Merge pull request #16656 from shishir-a412ed/man_docker_daemon_dns-opt
Add dns-opt option to docker daemon man page
Upstream-commit: 724b410c555a278d428929d125005d624d4a94a5
Component: engine
2015-09-29 14:07:43 -07:00
681be8cc45 Vendor in stretchr/testify to fix GCCGO issue with function name parsing
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 81c42d6c1e7df423aa07674a38028abfa9522f51
Component: engine
2015-09-29 19:20:03 +00:00
7b6894fa8a Windows: --hostname support
This passes through the container hostname to HCS, which in Windows Server
2016 TP4 will set the container's hostname in the registry before starting
it. This will be silently ignored by TP3.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 7e8c92ad72aecda178c41dbe7e1aa9269be39d5d
Component: engine
2015-09-29 12:13:06 -07:00
69db6279aa Revert "Merge pull request #16228 from duglin/ContextualizeEvents"
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.

Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).

This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing
changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967.

Signed-off-by: Tibor Vass <tibor@docker.com>

Conflicts:
	api/server/container.go
	builder/internals.go
	daemon/container_unix.go
	daemon/create.go
Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78
Component: engine
2015-09-29 14:26:51 -04:00
1ef276acc9 Add constants for AUFS whiteout files
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 2fb5d0c32376951ef41a6f64bb7dbd8f6fd14fba
Component: engine
2015-09-29 11:21:45 -07:00
fef14476a9 Revert "Merge pull request #16567 from calavera/context_per_request"
This reverts commit ff92f45be49146cd7ac7716c36d89de989cb262e, reversing
changes made to 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c.

Reverting to make the next revert easier.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 79c31f4b13d331d4011b2975a96dcdeab2036865
Component: engine
2015-09-29 13:40:46 -04:00
1e6abba179 Merge pull request #16570 from duglin/ReaderFix
Make Close() on simpleReaderCloser actually close the reader
Upstream-commit: 252af0ae2fe8cd68c527b8c5bf6e3dd1c23d8574
Component: engine
2015-09-29 12:55:03 -04:00
6ba4be05e8 Add dns-opt option to docker daemon man page
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 8db945abb96b983ef391b3513df38a368708e963
Component: engine
2015-09-29 12:31:51 -04:00
e87759cf33 Merge pull request #16649 from mtrmac/16648-test-text-fixups
Fix text not matching the actual tests
Upstream-commit: 4e0eb91c5577a0310366d699fbed3b213e7caa38
Component: engine
2015-09-29 12:01:19 -04:00
ca2ed97d93 Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test
Fix TestAttachClosedOnContainerStop racey test
Upstream-commit: 992e464a80e880930817f7622d1b6a5ff63b1033
Component: engine
2015-09-29 11:49:24 -04:00
2f036a6241 Merge pull request #16641 from cpuguy83/16598_fix_TestExecStartFails
Make sure test container is running before exec
Upstream-commit: 499b76d2ecb97ed1e59c732770ccdad6a1c8b3b6
Component: engine
2015-09-29 11:25:14 -04:00
cd1e105d78 Add basic support for .wh..wh..opq
This fixes the case where directory is removed in
aufs and then the same layer is imported to a
different graphdriver.

Currently when you do `rm -rf /foo && mkdir /foo`
in a layer in aufs the files under `foo` would
only be be hidden on aufs.

The problems with this fix:

1) When a new diff is recreated from non-aufs driver
the `opq` files would not be there. This should not
mean layer differences for the user but still
different content in the tar (one would have one
`opq` file, the others would have `.wh.*` for every
file inside that folder). This difference also only
happens if the tar-split file isn’t stored for the
layer.

2) New files that have the filenames before `.wh..wh..opq`
when they are sorted do not get picked up by non-aufs
graphdrivers. Fixing this would require a bigger
refactoring that is planned in the future.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 00e3277107a63218b656a36457caf380f9cabf37
Component: engine
2015-09-29 08:22:25 -07:00
9346a064f4 Fix TestAttachClosedOnContainerStop racey test
This test is failing once in a while on the CI, because the docker
attach command might be called after the container ends.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 50852f3be3d09d8bf6957d2ff27c26966b871e80
Component: engine
2015-09-29 16:57:58 +02:00
5c97861d03 Make sure test container is running before exec
Fixes race in TestExecStartFails

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9077c8968950133fdfac9898a20f9887f8df78f2
Component: engine
2015-09-29 10:06:51 -04:00
4b1e83454e Do not parse config.Volumes for named volumes
Fixes an issue where `VOLUME some_name:/foo` would be parsed as a named
volume, allowing access from the builder to any volume on the host.

This makes sure that named volumes must always be passed in as a bind.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8e5bb8fdd37879ec04c3419b8ecfce7a0477cdcf
Component: engine
2015-09-29 10:01:57 -04:00
5950661408 Fix text not matching the actual tests
Also fixes a typo in image name.

Fixes #16648

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Upstream-commit: 8781367c77a915799dff2892f4506f085ac6b68b
Component: engine
2015-09-29 15:26:04 +02:00
36b4d666eb Fix TestDockerCmd*Timeout racey tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7eab3db324d6619b59322cacbda0d3095e5ec6c3
Component: engine
2015-09-29 14:50:22 +02:00
ea3c3f33bf Do not try to cleanupMounts if daemon.repository is empty
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: 213a0f9d868db07094f90afa944bd0103f40f629
Component: engine
2015-09-29 11:30:18 +08:00
d28e940bb7 Skip /dev setup in container when it is bind mounted in
We need to set the device array to nil to skip /dev setup in runc/libcontainer.
See c9d5850629

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
Upstream-commit: 4911b588627619b0e5c9cec5180b5aeea1e5fcd9
Component: engine
2015-09-28 18:28:16 -04:00
1bdb03b312 Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
TestRunUnknownCommand 30s, not 30ns
Upstream-commit: d6e7350b961d856dcc39db5accd898279d1be3da
Component: engine
2015-09-28 14:31:48 -07:00
1159e2fd1b Merge pull request #16636 from Microsoft/setrunninglocking
Move setRunningLocking to test code
Upstream-commit: 79dd76b6024d834cd7e6bc769dcff8e55fbac59f
Component: engine
2015-09-28 14:25:32 -07:00
e1405c129c Windows: Fix TestRunStdinBlockedAfterContainerExit
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 4d301f0059c4e2e4ecea1ed41f2c1588b8db6990
Component: engine
2015-09-28 14:08:26 -07:00
b5b9cbb133 Merge pull request #16608 from vdemeester/16585-revert-env-regexp
Revert environment regexp in opts
Upstream-commit: ab8a4102e1be31b5b6a15b707dba360fb4219ac8
Component: engine
2015-09-28 13:54:17 -07:00
cf83257849 Move setRunningLocking to test code
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: eff253dfaf5f6a18a83df946823049b301931995
Component: engine
2015-09-28 13:48:12 -07:00
2e16748341 TestRunUnknownCommand 30s, not 30ns
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 74aeb0350e8a3cd73646bbfe45cfee8901f0cf28
Component: engine
2015-09-28 13:40:17 -07:00
f3c86e1ecc Merge pull request #16616 from sunyuan3/TestRunWithSwappinessInvalid
Update TestRunWithSwappinessInvalid.
Upstream-commit: 17062aea218c2cc8a03316443d902541247ca95d
Component: engine
2015-09-28 11:42:26 -07:00
6900c89d83 Revert environment regexp from 13694
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7335544fd062de71454a9cd45ff664e2407206e6
Component: engine
2015-09-28 20:26:20 +02:00
f40e350889 Command line, manpage and deprecation documentation.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 4acf29a80813c8f14174390fbaf5cb74c4a7fadc
Component: engine
2015-09-28 10:31:04 -07:00
e7ae7ea3cd Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c576310b6f11c22c1372d1aa214d4c2efdbc7d7f
Component: engine
2015-09-28 15:13:42 +02:00
0b0feca4e8 Fix comment typo in attach.go
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 4e62bd97d37df252213218e5b756ba7da9b1f336
Component: engine
2015-09-28 08:59:40 -04:00
5bf9802e2c Update TestRunWithSwappinessInvalid.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 3571814dc508b61d60db894f7634a263b73e3a4e
Component: engine
2015-09-28 18:13:21 +08:00
ca41ef5d58 bash completion for docker daemon --cluster-*
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1c71c1995fd9989c3d3c6a06e0dfdfe39c32a206
Component: engine
2015-09-28 11:23:23 +02:00
f935cc47fb Merge pull request #16229 from icecrime/discovery
Add builtin nodes discovery
Upstream-commit: 9324b154d27643caed58c12e8c49630eeceb4fda
Component: engine
2015-09-27 18:06:27 -07:00
71b700b568 Merge pull request #16109 from charleswhchan/patch-3
Touch up "Dockerfile reference"
Upstream-commit: 486c12525f27dd51c89cde910c5ea06665824095
Component: engine
2015-09-27 15:12:17 -07:00
f5b582c317 fix discovery package documentation with the right --cluster* flags
Signed-off-by: Alexandre Beslic <abronan@docker.com>
Upstream-commit: da294050f3196145c0fc0ec18823232a8770e7f8
Component: engine
2015-09-27 13:40:42 -07:00
d966435345 Merge pull request #16603 from icecrime/add_more_vincent
Add @vdemeester to MAINTAINERS
Upstream-commit: 457a066ff043e8c4615addb37c4d0ccb48344db7
Component: engine
2015-09-27 12:14:39 -07:00
2f753b8d99 Touch up "Dockerfile reference"
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 60f76bbfe1baaa0c1cc94b997022df6b8c44f07f
Component: engine
2015-09-27 08:04:36 -07:00
1775a6e17a Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page
cleaning up the first few paragraphs of getting started with containers
Upstream-commit: 1cab5a50d095e25b20e8ec93a13b985909f30f7d
Component: engine
2015-09-27 08:02:14 -07:00
798ccba56f Merge pull request #16338 from twaugh/env-replacement-label
Add documentation note that LABEL allows environment replacement
Upstream-commit: f8f03a290c98063936643c26a0345439a25fe1a7
Component: engine
2015-09-27 08:00:53 -07:00
360eb92f7d Validate --cpuset-cpus, --cpuset-mems
Before this patch libcontainer badly errored out with `invalid
argument` or `numerical result out of range` while trying to write
to cpuset.cpus or cpuset.mems with an invalid value provided.
This patch adds validation to --cpuset-cpus and --cpuset-mems flag along with
validation based on system's available cpus/mems before starting a container.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 94464e3a5e1dce0f6b3e821f79fe193278f67dba
Component: engine
2015-09-27 16:38:58 +02:00
72834631b5 Sort maintainers by name
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 6957b671bb65f53b6e03705266e76770d339eec9
Component: engine
2015-09-26 08:11:36 -07:00
b3a26eaa63 Add @vdemeester to MAINTAINERS
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: fcb9d8d8992d275bf2718657b6650e7bfed09a33
Component: engine
2015-09-26 08:09:44 -07:00
602b65fbb2 Vendoring in libnetwork with the fix for compilation error using GCCGo (X86 GCCGO CI)
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: ba4c132491b913d050c3fdf72f623b59f3dbb563
Component: engine
2015-09-26 01:37:56 +00:00
f1d2880874 Try me now, no linuxmint mentions needed
Signed-off-by: Dan Levy <dan@danlevy.net>
Upstream-commit: 9728269424461696cf2223ebb723828041da1f61
Component: engine
2015-09-25 19:07:59 -06:00
a0f9fee301 Prevent push and pull to v1 registries by filtering the available endpoints.
Add a daemon flag to control this behaviour.  Add a warning message when pulling
an image from a v1 registry.  The default order of pull is slightly altered
with this changset.

Previously it was:
https v2, https v1, http v2, http v1

now it is:
https v2, http v2, https v1, http v1

Prevent login to v1 registries by explicitly setting the version before ping to
prevent fallback to v1.

Add unit tests for v2 only mode.  Create a mock server that can register
handlers for various endpoints.  Assert no v1 endpoints are hit with legacy
registries disabled for the following commands:  pull, push, build, run and
login.  Assert the opposite when legacy registries are not disabled.

Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 39f2f15a35121f348e1a87db4203bcb72e632b16
Component: engine
2015-09-25 15:59:42 -07:00