Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Dec 21, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions image/fix_permissions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 14 additions & 11 deletions image/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ! id -nG act | grep -qw "$docker_group"; then
fix_permissions=true
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
fi
fi
fi
fi
Expand Down