From 7403c94ef4ceba9a83da931c69be856507eca70f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 13 Dec 2016 14:44:08 -0800 Subject: [PATCH] Only default to experimental if dockerd supports it This allows 1.12 engine to still be supported on master. Signed-off-by: Justin Cormack --- alpine/packages/docker/etc/init.d/docker | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/alpine/packages/docker/etc/init.d/docker b/alpine/packages/docker/etc/init.d/docker index acdc4ef87..0a0b36f3a 100755 --- a/alpine/packages/docker/etc/init.d/docker +++ b/alpine/packages/docker/etc/init.d/docker @@ -76,8 +76,11 @@ 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 - cat /etc/docker/daemon.json | jq -e 'has("experimental")' > /dev/null || DOCKER_OPTS="${DOCKER_OPTS} --experimental" + # Set experimental=true if not specified in daemon.json and on 1.13+ + 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)