From 2e4ee1a73f5ec9913a33e839908668b77a92279d Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 17 Nov 2016 20:44:06 +0000 Subject: [PATCH] Default to experimental if not specified in daemon.json Most editions were shipping with experimental; now it is a daemon flag this seems the best behaviour. Only do this on recent dockerd as we are still supporting 1.12 for a while longer. Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index f5002ae92..4d2074e04 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -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