From b358cbedd60f44995a3be674d813e18aa676b0a4 Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Sun, 23 Jul 2023 12:25:13 +0200
Subject: [PATCH] fix dind-rootless container not starting #20

---
 image/Dockerfile | 2 +-
 image/run.sh     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/image/Dockerfile b/image/Dockerfile
index 5cca6cc..a8ab995 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -198,7 +198,7 @@ ubuntu-20.04:docker://catthehacker/ubuntu:runner-20.04' \
   #
   GITEA_INSTANCE_INSECURE='false' \
   #
-  GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST="unix:///var/run/docker.sock" \
+  GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST="" \
   GITEA_RUNNER_JOB_CONTAINER_NETWORK='bridge' \
   GITEA_RUNNER_JOB_CONTAINER_OPTIONS='' \
   GITEA_RUNNER_JOB_CONTAINER_PRIVILEGED='false' \
diff --git a/image/run.sh b/image/run.sh
index 03a45ba..80a9c91 100644
--- a/image/run.sh
+++ b/image/run.sh
@@ -33,7 +33,7 @@ fi
 #################################################################
 # start docker deamon (if installed = DinD)
 #################################################################
-if [[ -f /etc/init.d/docker-rootless ]]; then
+if [[ -f /usr/bin/dockerd-rootless.sh ]]; then
   export DOCKER_MODE=dind-rootless
   log INFO "Starting Docker engine (rootless)..."
   export DOCKER_HOST=unix://$HOME/.docker/run/docker.sock
@@ -76,6 +76,10 @@ else
   export DOCKER_MODE=dood
 fi
 
+if [[ -z ${GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST:-} ]]; then
+  export GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST=${DOCKER_HOST:-unix:///var/run/docker.sock}
+fi
+
 
 #################################################################
 # check if act user UID/GID needs adjustment