fix dind-rootless container not starting #20

This commit is contained in:
sebthom 2023-07-23 12:25:13 +02:00
parent 0866e7aafc
commit b358cbedd6
2 changed files with 6 additions and 2 deletions

View File

@ -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' \

View File

@ -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