From 9f5975b717211fd4e34bf505e9caddedf4b4860e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 31 Aug 2025 08:50:32 +0200 Subject: [PATCH] Only configure Docker if it is present on the system --- migrations/1754984734.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/migrations/1754984734.sh b/migrations/1754984734.sh index fc39b17..d9f6cf1 100644 --- a/migrations/1754984734.sh +++ b/migrations/1754984734.sh @@ -1,21 +1,23 @@ echo "Configure Docker to use the host's DNS resolver" -# If the daemon configuration has been changed since we wrote it, leave it as-is -ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}' +if cmd-present docker; then + # If the daemon configuration has been changed since we wrote it, leave it as-is + ORIGINAL_CONFIG='{"log-driver":"json-file","log-opts":{"max-size":"10m","max-file":"5"}}' -NEW_CONFIG='{ - "log-driver": "json-file", - "log-opts": { "max-size": "10m", "max-file": "5" }, - "dns": ["172.17.0.1"], - "bip": "172.17.0.1/16" -}' + NEW_CONFIG='{ + "log-driver": "json-file", + "log-opts": { "max-size": "10m", "max-file": "5" }, + "dns": ["172.17.0.1"], + "bip": "172.17.0.1/16" + }' -if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then - echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null + if grep -Fq "$ORIGINAL_CONFIG" /etc/docker/daemon.json 2>/dev/null; then + echo "$NEW_CONFIG" | sudo tee /etc/docker/daemon.json >/dev/null + fi + + # Expose systemd-resolved to our Docker network + echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null + + sudo systemctl restart systemd-resolved + sudo systemctl restart docker fi - -# Expose systemd-resolved to our Docker network -echo -e '[Resolve]\nDNSStubListenerExtra=172.17.0.1' | sudo tee /etc/systemd/resolved.conf.d/20-docker-dns.conf >/dev/null - -sudo systemctl restart systemd-resolved -sudo systemctl restart docker