github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-08-06 17:23:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #878 from justincormack/1.12-compat

Browse Source 
Only default to experimental if dockerd supports it
This commit is contained in:
Justin Cormack 2016-12-13 14:50:32 -08:00 committed by GitHub
commit 0256d1eedd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
alpine/packages/docker/etc/init.d/docker
View File

@ -76,8 +76,11 @@ start()
# Set Docker to debug debug if not specified in daemon.json # 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" 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 # Set experimental=true if not specified in daemon.json and on 1.13+
cat /etc/docker/daemon.json | jq -e 'has("experimental")' > /dev/null || DOCKER_OPTS="${DOCKER_OPTS} --experimental" 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 # choose storage driver
if ! $(cat /etc/docker/daemon.json | jq -e '."storage-driver"' > /dev/null) if ! $(cat /etc/docker/daemon.json | jq -e '."storage-driver"' > /dev/null)