Skip to content

Commit 624040c

Browse files
committed
Make the userland proxy disabling more user friendly
1 parent f88da83 commit 624040c

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

docker_db.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,15 +619,25 @@ EOF\""
619619

620620
disable_userland_proxy() {
621621
if [[ "$HEALTCHECK_PATH" == "{{.State.Health.Status}}" ]]; then
622-
if ! sudo test -f /etc/docker/daemon.json; then
622+
if [[ ! -f /etc/docker/daemon.json ]]; then
623+
echo "Didn't find /etc/docker/daemon.json but need to disable userland-proxy..."
624+
echo "Stopping docker..."
623625
sudo service docker stop
626+
echo "Creating /etc/docker/daemon.json..."
624627
sudo bash -c "echo '{\"userland-proxy\": false}' > /etc/docker/daemon.json"
628+
echo "Starting docker..."
625629
sudo service docker start
626-
elif ! sudo grep -q userland-proxy /etc/docker/daemon.json; then
630+
echo "Docker successfully started with userland proxies disabled"
631+
elif ! grep -q userland-proxy /etc/docker/daemon.json; then
632+
echo "Userland proxy is still enabled in /etc/docker/daemon.json, but need to disable it..."
627633
export docker_daemon_json=$(</etc/docker/daemon.json)
634+
echo "Stopping docker..."
628635
sudo service docker stop
636+
echo "Updating /etc/docker/daemon.json..."
629637
sudo bash -c 'echo "${docker_daemon_json/\}/,}\"userland-proxy\": false}" > /etc/docker/daemon.json'
638+
echo "Starting docker..."
630639
sudo service docker start
640+
echo "Docker successfully started with userland proxies disabled"
631641
fi
632642
fi
633643
}

0 commit comments

Comments
 (0)