From 4f73fa84d5fca816af0d2c6275fb52ca955eb0de Mon Sep 17 00:00:00 2001
From: sebthom <sebthom@users.noreply.github.com>
Date: Thu, 6 Apr 2023 14:34:33 +0200
Subject: [PATCH] Installing runner as /usr/local/bin/act_runner

---
 build-image.sh      |  9 +++++++++
 image/Dockerfile    | 17 ++++++++---------
 image/run.sh        |  2 +-
 image/run_runner.sh |  4 ++--
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/build-image.sh b/build-image.sh
index fd6b944..24e4dbb 100644
--- a/build-image.sh
+++ b/build-image.sh
@@ -43,6 +43,15 @@ DOCKER_BUILDKIT=1 docker build "$project_root" \
    "$@"
 
 
+#################################################
+# test image
+#################################################
+echo
+echo "Testing docker image [$image_name]..."
+docker run --rm $image_name act_runner --version
+echo
+
+
 #################################################
 # perform security audit
 #################################################
diff --git a/image/Dockerfile b/image/Dockerfile
index bc3f200..2f90d56 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -91,17 +91,16 @@ RUN --mount=type=bind,source=.shared,target=/mnt/shared <<EOF
   echo "#################################################"
   echo "Downloading Gitea act runner..."
   echo "#################################################"
-  mkdir /opt/act
-  curl -fsSL $ACT_RUNNER_DOWNLOAD_URL -o /opt/act/runner
-  chmod 755 /opt/act/runner
-  ls -l /opt/act/runner
+  curl -fsSL $ACT_RUNNER_DOWNLOAD_URL -o /usr/local/bin/act_runner
+  chmod 755 /usr/local/bin/act_runner
+  ls -l /usr/local/bin/act_runner
   echo "Stripping..."
-  strip --strip-unneeded /opt/act/runner
-  ls -l /opt/act/runner
+  strip --strip-unneeded /usr/local/bin/act_runner
+  ls -l /usr/local/bin/act_runner
   if [[ $UPX_COMPRESS == "true" ]]; then
-    /opt/upx/upx -9 /opt/act/runner
+    /opt/upx/upx -9 /usr/local/bin/act_runner
   fi
-  /opt/act/runner --version
+  act_runner --version
 
 EOF
 
@@ -110,7 +109,7 @@ EOF
 # runtime image
 ######################
 FROM runtime-base-image
-COPY --from=build-image /opt/act/runner /opt/act/runner
+COPY --from=build-image /usr/local/bin/act_runner /usr/local/bin/act_runner
 
 ARG BUILD_DATE
 ARG GIT_BRANCH
diff --git a/image/run.sh b/image/run.sh
index 40d1818..61265ef 100644
--- a/image/run.sh
+++ b/image/run.sh
@@ -65,4 +65,4 @@ fi
 #################################################################
 # Launch the runner with adjusted UID/GID
 #################################################################
-exec sudo -u act -g act -E bash /opt/run_runner.sh
\ No newline at end of file
+exec sudo -u act -g act -E bash /opt/run_runner.sh
diff --git a/image/run_runner.sh b/image/run_runner.sh
index 297a30b..f6d8b6e 100644
--- a/image/run_runner.sh
+++ b/image/run_runner.sh
@@ -30,7 +30,7 @@ if [[ ! -s .runner ]]; then
   if [[ -z ${GITEA_RUNNER_REGISTRATION_TOKEN:-} ]]; then
     read -r GITEA_RUNNER_REGISTRATION_TOKEN < "$GITEA_RUNNER_REGISTRATION_TOKEN_FILE"
   fi
-  /opt/act/runner register \
+  act_runner register \
     --instance "${GITEA_INSTANCE_URL}" \
     --token    "${GITEA_RUNNER_REGISTRATION_TOKEN}" \
     --name     "${GITEA_RUNNER_NAME}" \
@@ -43,4 +43,4 @@ fi
 #################################################
 # run the act runner
 #################################################
-exec /opt/act/runner daemon
+exec act_runner daemon