From 0c163b8c492e580f1b0501819afa8e24630b1a62 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Mon, 5 Dec 2022 00:53:33 +0100 Subject: [PATCH] Allow to use different DOCKER_HOST env var This allows to use rootless podman (which doesn't require sudo) instead of docker. --- script/diaspora-dev | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/script/diaspora-dev b/script/diaspora-dev index 5bd032ea2..18c4facda 100755 --- a/script/diaspora-dev +++ b/script/diaspora-dev @@ -179,8 +179,10 @@ print_usage_full() { # ----- Helper functions ----- dia_docker_compose() { + local docker_socket="${DOCKER_HOST:-"unix:///var/run/docker.sock"}" + docker_socket="${docker_socket#unix://}" # Check permissions of docker socket and use sudo if needed - if [ -r "/var/run/docker.sock" ] && [ -w "/var/run/docker.sock" ]; then + if [ -r "${docker_socket}" ] && [ -w "${docker_socket}" ]; then docker-compose "$@" else echo "Attention: Docker socket not writable, using sudo for the docker command. You might be asked for your password now." >&2