github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 10:09:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1237 from justincormack/no-experimental-default

Browse Source 
Default to non experimental mode
This commit is contained in:
Riyaz Faizullabhoy 2017-03-01 21:55:38 -08:00 committed by GitHub
commit c133b04475
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,12 +80,6 @@ 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 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
# On GCP, send logs to Google Cloud Logging # On GCP, send logs to Google Cloud Logging
# Disabled because of https://github.com/docker/docker/issues/29344 # Disabled because of https://github.com/docker/docker/issues/29344
# [ $(mobyplatform) = "gcp" ] && DOCKER_OPTS="${DOCKER_OPTS} --log-driver=gcplogs" # [ $(mobyplatform) = "gcp" ] && DOCKER_OPTS="${DOCKER_OPTS} --log-driver=gcplogs"