Merge pull request #751 from justincormack/experimental

Default to experimental if not specified in daemon.json
This commit is contained in:
Justin Cormack 2016-11-18 10:40:55 +00:00 committed by GitHub
commit 627e665e3d

View File

@ -84,6 +84,12 @@ start()
# Set Docker to debug debug if not specified in daemon.json
cat /etc/docker/daemon.json | jq -e 'has("debug")' > /dev/null || DOCKER_OPTS="${DOCKER_OPTS} --debug"
# Set experimental=true if not specified in daemon.json if dockerd supports it
if dockerd --help | grep -q experimental
then
cat /etc/docker/daemon.json | jq -e 'has("experimental")' > /dev/null || DOCKER_OPTS="${DOCKER_OPTS} --experimental"
fi
# choose storage driver
if ! $(cat /etc/docker/daemon.json | jq -e '."storage-driver"' > /dev/null)
then