diff --git a/install/config/docker.sh b/install/config/docker.sh index 1499f9c8..8757d6cf 100644 --- a/install/config/docker.sh +++ b/install/config/docker.sh @@ -1,32 +1,10 @@ -# Configure Docker daemon: -# - limit log size to avoid running out of disk -# - use host's DNS resolver -sudo mkdir -p /etc/docker -sudo tee /etc/docker/daemon.json >/dev/null <<'EOF' -{ - "log-driver": "json-file", - "log-opts": { "max-size": "10m", "max-file": "5" }, - "dns": ["172.17.0.1"], - "bip": "172.17.0.1/16" -} -EOF +# Docker config files (daemon.json, resolved drop-in, no-block-boot drop-in) +# ship via omarchy-settings. This script only handles the runtime side: +# - reload systemd-resolved so the new drop-in takes effect +# - add the current user to the docker group +# - enable docker.socket and reload systemd unit files -# Expose systemd-resolved to our Docker network -sudo mkdir -p /etc/systemd/resolved.conf.d -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 - -# Start Docker on-demand sudo systemctl enable docker.socket - -# Give this user privileged Docker access sudo usermod -aG docker ${USER} - -# Prevent Docker from preventing boot for network-online.target -sudo mkdir -p /etc/systemd/system/docker.service.d -sudo tee /etc/systemd/system/docker.service.d/no-block-boot.conf <<'EOF' -[Unit] -DefaultDependencies=no -EOF - sudo systemctl daemon-reload