merith-tk/forgejo-runner
1
0
Fork 0
Code Issues Pull requests 2 Projects Releases Packages Wiki Activity Actions

[FORGEJO] fix name of binary to forgejo-runner for rootless docker image

Browse source
This commit is contained in:
Louis Seubert 2023-07-08 11:29:35 +02:00 committed by Earl Warren
parent 331984a5b9
commit 91cf33f75d
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Dockerfile.rootless
View file

@ -2,8 +2,8 @@ FROM golang:1.21-alpine3.18 as builder
# Do not remove `git` here, it is required for getting runner version when executing `make build` # Do not remove `git` here, it is required for getting runner version when executing `make build`
RUN apk add --no-cache make git RUN apk add --no-cache make git
COPY . /opt/src/act_runner COPY . /opt/src/forgejo-runner
WORKDIR /opt/src/act_runner WORKDIR /opt/src/forgejo-runner
RUN make clean && make build RUN make clean && make build
@ -12,7 +12,7 @@ USER root
RUN apk add --no-cache \ RUN apk add --no-cache \
git bash supervisor git bash supervisor
COPY --from=builder /opt/src/act_runner/act_runner /usr/local/bin/act_runner COPY --from=builder /opt/src/forgejo-runner/forgejo-runner /usr/local/bin/forgejo-runner
COPY /scripts/supervisord.conf /etc/supervisord.conf COPY /scripts/supervisord.conf /etc/supervisord.conf
COPY /scripts/run.sh /opt/act/run.sh COPY /scripts/run.sh /opt/act/run.sh
COPY /scripts/rootless.sh /opt/act/rootless.sh COPY /scripts/rootless.sh /opt/act/rootless.sh

10
scripts/run.sh
View file

@ -21,12 +21,12 @@ if [[ ! -s .runner ]]; then
try=$((try + 1)) try=$((try + 1))
success=0 success=0
# The point of this loop is to make it simple, when running both act_runner and gitea in docker, # The point of this loop is to make it simple, when running both forgejo-runner and gitea in docker,
# for the act_runner to wait a moment for gitea to become available before erroring out. Within # for the forgejo-runner to wait a moment for gitea to become available before erroring out. Within
# the context of a single docker-compose, something similar could be done via healthchecks, but # the context of a single docker-compose, something similar could be done via healthchecks, but
# this is more flexible. # this is more flexible.
while [[ $success -eq 0 ]] && [[ $try -lt ${GITEA_MAX_REG_ATTEMPTS:-10} ]]; do while [[ $success -eq 0 ]] && [[ $try -lt ${GITEA_MAX_REG_ATTEMPTS:-10} ]]; do
act_runner register \ forgejo-runner register \
--instance "${GITEA_INSTANCE_URL}" \ --instance "${GITEA_INSTANCE_URL}" \
--token "${GITEA_RUNNER_REGISTRATION_TOKEN}" \ --token "${GITEA_RUNNER_REGISTRATION_TOKEN}" \
--name "${GITEA_RUNNER_NAME:-`hostname`}" \ --name "${GITEA_RUNNER_NAME:-`hostname`}" \
@ -42,7 +42,7 @@ if [[ ! -s .runner ]]; then
fi fi
done done
fi fi
# Prevent reading the token from the act_runner process # Prevent reading the token from the forgejo-runner process
unset GITEA_RUNNER_REGISTRATION_TOKEN unset GITEA_RUNNER_REGISTRATION_TOKEN
act_runner daemon ${CONFIG_ARG} forgejo-runner daemon ${CONFIG_ARG}