runners
/
docker-gitea-act-runner
mirror of https://github.com/vegardit/docker-gitea-act-runner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: correct error `'/var/run/docker.sock': No such file or directory` when `GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST` is set

This commit is contained in:
MuXiu1997 2023-12-21 16:25:59 +08:00 committed by Sebastian Thomschke
parent 7e9c085afa
commit 5a8bf4fda0
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
image/fix_permissions.sh
View File

@ -43,22 +43,24 @@ fi
#################################################################
# ensure act user has read/write access to /var/run/docker.sock
# ensure act user has read/write access to docker socket in GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST
#################################################################
if [[ $DOCKER_MODE != "dind-rootless" ]]; then
docker_sock=/var/run/docker.sock
if runuser -u $act_user -- [ ! -r $docker_sock ] || runuser -u $act_user -- [ ! -w $docker_sock ]; then
docker_group=$(stat -c '%G' $docker_sock)
if [[ $docker_group == "UNKNOWN" ]]; then
docker_gid=$(stat -c '%g' $docker_sock)
docker_group="docker$docker_gid"
log INFO "Creating group [$docker_group]..."
addgroup --gid $docker_gid $docker_group
fi
if [[ $GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST == unix://* ]]; then
docker_sock=${GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST#unix://}
if runuser -u $act_user -- [ ! -r $docker_sock ] || runuser -u $act_user -- [ ! -w $docker_sock ]; then
docker_group=$(stat -c '%G' $docker_sock)
if [[ $docker_group == "UNKNOWN" ]]; then
docker_gid=$(stat -c '%g' $docker_sock)
docker_group="docker$docker_gid"
log INFO "Creating group [$docker_group]..."
addgroup --gid $docker_gid $docker_group
fi
if ! id -nG $act_user | grep -qw "$docker_group"; then
log INFO "Adding user [$act_user] to docker group [$(getent group $docker_group)]..."
usermod -aG $docker_group $act_user
if ! id -nG $act_user | grep -qw "$docker_group"; then
log INFO "Adding user [$act_user] to docker group [$(getent group $docker_group)]..."
usermod -aG $docker_group $act_user
fi
fi
fi
fi

23
image/run.sh
View File

@ -104,19 +104,22 @@ fi
#################################################################
# check if act user has read/write access to /var/run/docker.sock
# check if act user has read/write access to docker socket in GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST
#################################################################
if [[ $DOCKER_MODE != "dind-rootless" ]]; then
if [[ ! -w /var/run/docker.sock || ! -r /var/run/docker.sock ]]; then
docker_group=$(stat -c '%G' /var/run/docker.sock)
if [[ $docker_group == "UNKNOWN" ]]; then
docker_gid=$(stat -c '%g' /var/run/docker.sock)
docker_group="docker$docker_gid"
fix_permissions=true
fi
if [[ $GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST == unix://* ]]; then
docker_sock=${GITEA_RUNNER_JOB_CONTAINER_DOCKER_HOST#unix://}
if [[ ! -w $docker_sock || ! -r $docker_sock ]]; then
docker_group=$(stat -c '%G' $docker_sock)
if [[ $docker_group == "UNKNOWN" ]]; then
docker_gid=$(stat -c '%g' $docker_sock)
docker_group="docker$docker_gid"
fix_permissions=true
fi
if ! id -nG act | grep -qw "$docker_group"; then
fix_permissions=true
if ! id -nG act | grep -qw "$docker_group"; then
fix_permissions=true
fi
fi
fi
fi