Commit Graph

23687 Commits

Author SHA1 Message Date
591507ba0c Set Pdeathsig for containerd on SIGKILL
Makes sure containerd exits (when started by docker) if docker gets
SIGKILL'd.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d4559313d5b0284bf2544d83e6431873c06f8349
Component: engine
2016-05-02 14:23:38 -04:00
858159027f Merge pull request #21879 from WeiZhang555/fix-kill-nonexist
Fix bug that can't kill an restarting container
Upstream-commit: cb87b6eb6a955e5a66b17e0a15557f37f76b85c0
Component: engine
2016-04-13 22:50:19 -07:00
925ceebdbf Merge pull request #21970 from cpuguy83/use_cached_path_on_ls
Fix N+1 calling `Path()` on `volume ls`
Upstream-commit: 7cd420d63a708c7763bceff231873c4e73b29c31
Component: engine
2016-04-13 22:47:53 -07:00
1e916c7133 Merge pull request #22013 from tonistiigi/fix-go16-panic
Fix panic on winsize syscall
Upstream-commit: 37f5caf8c5d96210c90eb3b22ec7bebb5ce1990d
Component: engine
2016-04-13 22:11:13 -07:00
f4871ac76e Fix panic on winsize syscall
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 4d4ef98326f0b21bbb661321499e200a1412bc64
Component: engine
2016-04-13 17:08:00 -07:00
d823c21aaa Bump Go version to 1.5.4/1.6.1 (security fix) (#21978)
Go 1.6.1 is for ppc64le only.

https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ

Dockerfile.armhf cannot currently be updated.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7268eb97bc208f4cdf7c9119da0cfa2c9ed558a4
Component: engine
2016-04-13 11:22:48 -07:00
05c398dfb7 Merge pull request #21953 from Microsoft/jjh/containerapipostcontainerstop
Windows: Fix deamon deadlock in docker stop
Upstream-commit: d954097c0b9e48010f980217167af6b40cf97e58
Component: engine
2016-04-13 13:28:59 -04:00
4447d74a76 Move build endpoint handler from daemon (#21972)
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 73ac6d199cacbcdba4c062f982b31f8d57e03f3c
Component: engine
2016-04-13 10:21:00 -07:00
6761133f09 Windows: Fix Hyper-V container ACLs for TP5 (#21974)
In TP5, Hyper-V containers need all image files ACLed so that the virtual
machine process can access them. This was fixed post-TP5 in Windows, but
for TP5 we need to explicitly add these ACLs.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 6f8878872f8782d4300faeb80413c8c60f56cff1
Component: engine
2016-04-13 10:15:38 -07:00
a4980222b8 Graphdriver docs (#22003)
* Fix closing strings in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Fix documenation for Err type in graphdriver plugins

Fix https://github.com/docker/go-plugins-helpers/issues/24

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing MountLabel argument in graphdriver plugin documentation

The real `Create` seems also to take more arguments (the `storageOpt`) which
are not exposed to the plugin API (yet?).

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>

* Add missing CreateReadWrite in graphdriver plugin documentation

Signed-off-by: Thomas Gazagnaire <thomas@gazagnaire.org>
Upstream-commit: 44fe649c2ed6c1c6ba201086c1f83ec993ce9064
Component: engine
2016-04-13 10:11:39 -07:00
2a0b94972b Merge pull request #19265 from rhatdan/netsysctl
Add support for setting sysctls
Upstream-commit: 988508a2b5aa18c04fd3db143b4e4f5f207ea15e
Component: engine
2016-04-13 18:36:30 +02:00
5f0157b8da Merge pull request #21942 from tiborvass/fix-21808
vendor runc to fix issue#21808
Upstream-commit: 9333042ba140680e5693a89338a4619e16538d61
Component: engine
2016-04-13 08:24:20 -07:00
cdd44b42de Merge pull request #21963 from moxiegirl/21701-issue-fix
Update for device mapper configuration 
Upstream-commit: 78729487cd0967459ca0e30db0785b0c6d33cc92
Component: engine
2016-04-13 17:19:16 +02:00
977c2f6a60 Fixes #21701 devicemapper docs
Copy edit the content
Updates to existing material
Adding mbentley's comments
Updating with last minute comments
Update with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 783ebebff40ebdae27dc72b4c8c5151a01220a87
Component: engine
2016-04-13 08:02:16 -07:00
df51bb2466 Merge pull request #21994 from thaJeztah/update-binary-installation
docs: update installation from binaries for 1.11
Upstream-commit: 1687f77db2892a3221cbafd46dc11e07ddcec438
Component: engine
2016-04-13 09:26:52 -04:00
35dbb56580 docs: update installation from binaries for 1.11
Binaries are now distributed as a '.tgz' or '.zip'
archive, and contain multiple binaries for Linux.

This updates the instructions for 1.11.

Also mention that the Windows 64-bit binary
actually can be used as a daemon. Given that
this is still in beta, no instructions were
added for *running* a daemon on Windows.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f5336c737086a4c1807bb2b6ab57116b5ed9d769
Component: engine
2016-04-13 15:26:03 +02:00
9a1f7c0972 Merge pull request #21885 from triccardi-systran/20612-improve-build-cache-miss-documentation
Improve build cache miss doc for `ARG` and `RUN`
Upstream-commit: edfe4e9fba89d0b8458e7e76132da2440c29ccbd
Component: engine
2016-04-13 15:23:14 +02:00
44c73694c8 Improve build cache miss doc for ARG and RUN
The documentation already says the cache miss happens only at `ARG`
variable usage, not declaration, but there is a very common implicit
usage: `RUN`, which this commit documents even more, improving on #21790.

Also, use `definition` instead of `declaration`: it's the same thing, and
`definition` is already used in this documentation, contrary to
`declaration`.

Also, distinguish between "instructions" and "variables defined by `ARG`
instructions".

Signed-off-by: Thomas Riccardi <riccardi@systran.fr>
Upstream-commit: 82f5ef2d2562f9e742eb694dc4b0a1f768a4f0de
Component: engine
2016-04-13 15:02:09 +02:00
c90d76ef8b Merge pull request #21965 from aboch/doc
Update /containers/create remote API docs
Upstream-commit: f5d3f528fd2edeb4acf857960698262777f410c5
Component: engine
2016-04-13 12:56:40 +02:00
da8ff9f6e7 Merge pull request #21959 from coolljt0725/fix_21957
Fix docker load progressbar, fixes #21957
Upstream-commit: 348d90276802aac6c76126f2fe6866c521190ecd
Component: engine
2016-04-13 00:31:27 -04:00
94711fe63a Fix docker load progressbar, fixes #21957
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 96d7db665b06cc0bbede22d818c69dc5f6921f66
Component: engine
2016-04-12 22:45:42 -04:00
7a5c745f9d Merge pull request #21949 from aaronlehmann/vendor-distribution-1622
Vendor distribution to correct config blob media type in schema2 manifest
Upstream-commit: 40502e381371763ea0942b7d6511f5c98b65bc1e
Component: engine
2016-04-12 21:23:22 -04:00
312476d137 Windows: Timeout TestContainerApiPostContainerStop
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d691b4af18ffbab68fb1aab3939e65b59c3e4c2a
Component: engine
2016-04-12 18:21:54 -07:00
56e19c6402 Merge pull request #21337 from yongtang/21247-TestRunAttachFailedNoLeak
Flaky test: TestRunAttachFailedNoLeak (#21247)
Upstream-commit: fa4fea32330c11b337873698c4a79244aabef4d2
Component: engine
2016-04-12 17:40:16 -07:00
1442a95a2d Fix N+1 calling Path() on volume ls
Implements a `CachedPath` function on the volume plugin adapter that we
call from the volume list function instead of `Path.
If a driver does not implement `CachedPath` it will just call `Path`.

Also makes sure we store the path on Mount and remove the path on
Unmount.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9e6b1852a78eda6ed2cb255d6be8a0d0e5a5ca40
Component: engine
2016-04-12 20:30:34 -04:00
2ba8d1600c Merge pull request #21962 from Microsoft/jjh/logssincefuturefollow
Windows: Disable flakey LogsSinceFutureFollow
Upstream-commit: f3dcc1c46249ffc4a73ab2005d1ad011dff3c7df
Component: engine
2016-04-12 15:07:51 -07:00
e1986078c7 Merge pull request #21897 from calavera/remove_authorization_refs_from_api
Move middleware to interfaces.
Upstream-commit: 9438572fc00f928ec83c884992d5492a7a68babb
Component: engine
2016-04-12 14:08:36 -07:00
13ff1eed5b Merge pull request #21714 from hallyn/2016-03-31/aufs.2
don't try to use aufs in a user namespace
Upstream-commit: 7c16063afaafaddf0b738fe9ad6221f55ee85a99
Component: engine
2016-04-12 14:07:51 -07:00
8becc1526b Update /containers/create remote API docs
- Show how to pass the networking config in POST containers/create body

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 30859c34569b900d3d798ad55f48f3d4fd7dc32c
Component: engine
2016-04-12 13:41:13 -07:00
c8bf9bd25d Windows: Fix flakey LogsSinceFutureFollow
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: acaef7caaf6078719d8e838efad0fb1b7ce153d8
Component: engine
2016-04-12 13:27:29 -07:00
ec5e265b2a vendor runc to fix issue#21808
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: c3fe4226f3aec1c59f581e636aece9cefaa9a515
Component: engine
2016-04-12 15:35:43 -04:00
ac02172c8d Merge pull request #21903 from cyphar/reduce-dependencies-pkg-listeners
pkg: listeners: move Docker-specific semantics to docker/daemon*
Upstream-commit: b6a08c3f117c5507e41a1e19c7b44229522409b1
Component: engine
2016-04-12 12:04:03 -07:00
3b52ebb9ff Add support for setting sysctls
This patch will allow users to specify namespace specific "kernel parameters"
for running inside of a container.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 9caf7aeefd23263a209c26c8439d26c147972d81
Component: engine
2016-04-12 13:37:31 -04:00
28a44b680b Merge pull request #21904 from yongtang/21848-stats-connected-containers
Docker stats is not working when a container is using another container's network.
Upstream-commit: d648d40ace5440d1a3c8c9dbc1115d40ebcbae3c
Component: engine
2016-04-12 10:28:05 -07:00
e6c347efc9 Merge pull request #21943 from Microsoft/jstarks/utilityvm
Windows: support embedded utility VM images
Upstream-commit: 7b5a6844c2a517e8b6927666e33becf341ac016b
Component: engine
2016-04-12 10:19:47 -07:00
9fa6291e4f Merge pull request #21948 from tianon/check-config-network
Add "VXLAN" to check-config.sh
Upstream-commit: 8cb511b7d68b8d4a053ca260070ba781360bbdbf
Component: engine
2016-04-12 10:10:48 -07:00
e9a5cf05bf Merge pull request #21960 from rhcarvalho/shm-validation-typo
Fix a typo in hostConfig.ShmSize validation
Upstream-commit: 595104daf67e9004ce771419a076b491345b5778
Component: engine
2016-04-12 12:05:31 -04:00
d31afa6053 Fix a typo in hostConfig.ShmSize validation
Other places referring to the same configuration, including docs, have
the correct spelling.

Signed-off-by: Rodolfo Carvalho <rhcarvalho@gmail.com>
Upstream-commit: fee7e7c7a31023be9f0c26608e6cbd4e8a97d25b
Component: engine
2016-04-12 16:45:05 +02:00
41e374e687 Merge pull request #21818 from Microsoft/jjh/tp4fortests
Windows: Remove TP4 support from test code
Upstream-commit: a0e7e1376605541d988387967f69469d25af060a
Component: engine
2016-04-12 10:07:12 +02:00
b1684f92ee pkg: listeners: move Docker-specific semantics to docker/daemon*
Since there are other users of pkg/listeners, it doesn't make sense to
contain Docker-specific semantics and warnings inside it. To that end,
move the scary warning about -tlsverify and the libnetwork port
allocation code to CmdDaemon (where they belong). This helps massively
reduce the dependency tree for users of pkg/listeners.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 5ee0a94101c30a4ac22379fdab50c0faad2d12c9
Component: engine
2016-04-12 12:50:43 +10:00
60b2b4b1f7 Vendor distribution to correct config blob media type in schema2 manifest
@nwt noticed that the media type specified in the config section of a
schema2 manifest is application/octet-stream, instead of the correct
value application/vnd.docker.container.image.v1+json.

This brings in https://github.com/docker/distribution/pull/1622 to fix
this.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: c18d03a7783bb78b7568bf3c23644888995e9a5d
Component: engine
2016-04-11 17:29:17 -07:00
78ecc63dec Windows: Support embedded utility VM images
For TP5, the utility VM for Hyper-V containers is embedded in the base
layer's contents.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: c70f153f52c8ca75a395d4dc1c4a5759871ada19
Component: engine
2016-04-11 17:16:17 -07:00
385a33a1f9 Add "VXLAN" to check-config.sh
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: c082dad637f2b7ee07a284143566746c98bf1211
Component: engine
2016-04-11 16:42:53 -07:00
86ed4f4024 Windows: Remove TP4 support from test code
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b0e24c73931d70ef543a3d69c41b0add7130cb80
Component: engine
2016-04-11 15:36:31 -07:00
5dca3a7e01 Merge pull request #21941 from crosbymichael/copy-bins
Improve source for containerd/runc copy
Upstream-commit: 2bcb6d694f9c8a7d4ce1b2b2a5d8a32ae5ea6085
Component: engine
2016-04-11 14:54:21 -07:00
03c94efb60 Windows: Revendor Microsoft/hcsshim
This change supports the importing of layers that contain utility VM
images. This is necessary to support Hyper-V containers running on a
non-centrally-managed image.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 15b0f06a9ad6778deeb9560c2f353e29d4f795da
Component: engine
2016-04-11 13:23:38 -07:00
43be88856e Improve source for containerd/runc copy
This improves getting the source for the binaries that are compiled on
the system so that they can be copied into the bundles output.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 45fb80331662b107ee523d184aef83fa3cae97f2
Component: engine
2016-04-11 12:02:01 -07:00
2be81f74a1 don't try to use aufs in a user namespace
If aufs is already modprobe'd but we are in a user namespace, the
aufs driver will happily load but then get eperm when it actually tries
to do something.  So detect that condition.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Upstream-commit: 2a71f28a4e1167dee32aa16ddbc819c9d9e77f71
Component: engine
2016-04-11 13:38:15 -05:00
0d8d22c8a5 Merge pull request #21811 from shishir-a412ed/cleanup_parse_storage_opt
parseStorageOpt: return size rather than updating devInfo.Size field
Upstream-commit: 577adcc1eeb58ab29cfbcd50048576b9c8f64584
Component: engine
2016-04-11 18:34:03 +02:00
431401c264 Merge pull request #21877 from AkihiroSuda/trivial-fix
oci: default devices don't need to be listed explicitly
Upstream-commit: 08e27a714895fd9c996a87cf1dc8bf0b7c3bcd6a
Component: engine
2016-04-11 09:24:47 -07:00