Brian Goff d1a1df20f1 Fix issue with bundles dir volume ...

The bundles dir used to be automatically made a volume if BINDDIR was
not set.

The `PKGCACHE_*` stuff was added recently which gets added to
`DOCKER_MOUNT`. This breaks the case where someone wants to use the
package cache (DOCKER_INCREMENTAL_BINARY is enabled) but has not
specified a bind dir but needs the bundles dir made a volume.

Moves the package cache handling to after the bundles dir is made a
volume.

Before this patch, if you have `DOCKER_GRAPHDRIVER` set to anything
other than vfs, the tests in the daemon suite (and swarm suite, and
registry suite) will fail to run since they cannot startup a daemon
(except for speicifc cases where <driver> over <driver> is possible,
like devmapper).

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a95ad53ca404cefd21a3efe2dc8c35c083df5a2b
Component: engine

2016-09-22 16:49:28 -04:00

components/engine

Fix issue with bundles dir volume

2016-09-22 16:49:28 -04:00

S

Description

The Docker CLI

clidocker

380 MiB

Languages

Go 92.3%

Shell 5.4%

Dockerfile 1.1%

Go-Checksums 0.7%

Makefile 0.3%

Other 0.2%