From 59c5e0ba1e71214f042ed63c5e709829789d0d04 Mon Sep 17 00:00:00 2001
From: Louis Seubert <louis.seubert.ls@gmail.com>
Date: Sat, 8 Jul 2023 11:29:35 +0200
Subject: [PATCH] [FORGEJO] fix name of binary to `forgejo-runner` for rootless
docker image
---
Dockerfile.rootless | 6 +++---
scripts/run.sh | 10 +++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile.rootless b/Dockerfile.rootless
index b80033d..60d3d27 100644
--- a/Dockerfile.rootless
+++ b/Dockerfile.rootless
@@ -2,8 +2,8 @@ FROM golang:1.20-alpine3.18 as builder
# Do not remove `git` here, it is required for getting runner version when executing `make build`
RUN apk add --no-cache make git
-COPY . /opt/src/act_runner
-WORKDIR /opt/src/act_runner
+COPY . /opt/src/forgejo-runner
+WORKDIR /opt/src/forgejo-runner
RUN make clean && make build
@@ -12,7 +12,7 @@ USER root
RUN apk add --no-cache \
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/run.sh /opt/act/run.sh
COPY /scripts/rootless.sh /opt/act/rootless.sh
diff --git a/scripts/run.sh b/scripts/run.sh
index d0154f0..89626b4 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -21,12 +21,12 @@ if [[ ! -s .runner ]]; then
try=$((try + 1))
success=0
- # The point of this loop is to make it simple, when running both act_runner and gitea in docker,
- # for the act_runner to wait a moment for gitea to become available before erroring out. Within
+ # The point of this loop is to make it simple, when running both forgejo-runner and gitea in docker,
+ # 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
# this is more flexible.
while [[ $success -eq 0 ]] && [[ $try -lt ${GITEA_MAX_REG_ATTEMPTS:-10} ]]; do
- act_runner register \
+ forgejo-runner register \
--instance "${GITEA_INSTANCE_URL}" \
--token "${GITEA_RUNNER_REGISTRATION_TOKEN}" \
--name "${GITEA_RUNNER_NAME:-`hostname`}" \
@@ -42,7 +42,7 @@ if [[ ! -s .runner ]]; then
fi
done
fi
-# Prevent reading the token from the act_runner process
+# Prevent reading the token from the forgejo-runner process
unset GITEA_RUNNER_REGISTRATION_TOKEN
-act_runner daemon ${CONFIG_ARG}
+forgejo-runner daemon ${CONFIG_ARG}