Merge pull request #36 from Magnus167/runner-upgrade

Update Docker setup for GitHub runner management

.github/runner/Dockerfile

@@ -18,13 +18,13 @@ RUN cd /home/docker && mkdir actions-runner && cd actions-runner \
 
 RUN chown -R docker ~docker && /home/docker/actions-runner/bin/installdependencies.sh
 
-COPY start.sh start.sh
+COPY entrypoint.sh entrypoint.sh
 
 # make the script executable
-RUN chmod +x start.sh
+RUN chmod +x entrypoint.sh
 
 # since the config and run script for actions are not allowed to be run by root,
 # set the user to "docker" so all subsequent commands are run as the docker user
 USER docker
 
-ENTRYPOINT ["./start.sh"]
+ENTRYPOINT ["./entrypoint.sh"]

.github/runner/docker-compose.yml

@@ -6,7 +6,8 @@ services:
       context: .
       args:
         RUNNER_VERSION: 2.323.0
-    container_name: github-runner
+    # container_name commented to allow for multiple runners
+    # container_name: github-runner
     env_file:
       - .env
     volumes:

.github/runner/entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+REPOSITORY=$REPO
+ACCESS_TOKEN=$GH_TOKEN
+LABELS=$RUNNER_LABELS
+
+# echo "REPO ${REPOSITORY}"
+# echo "ACCESS_TOKEN ${ACCESS_TOKEN}"
+
+REG_TOKEN=$(curl -X POST -H "Authorization: token ${ACCESS_TOKEN}" -H "Accept: application/vnd.github+json" https://api.github.com/repos/${REPOSITORY}/actions/runners/registration-token | jq .token --raw-output)
+
+cd /home/docker/actions-runner
+
+./config.sh --url https://github.com/${REPOSITORY} --token ${REG_TOKEN} --labels ${LABELS}
+
+cleanup() {
+    echo "Removing runner..."
+    ./config.sh remove --unattended --token ${REG_TOKEN}
+}
+
+trap 'cleanup; exit 130' INT
+trap 'cleanup; exit 143' TERM
+
+./run.sh & wait $!

.github/runner/start.sh

@@ -1,24 +1,4 @@
-#!/bin/bash
 
-REPOSITORY=$REPO
-ACCESS_TOKEN=$GH_TOKEN
-LABELS=$RUNNER_LABELS
 
-# echo "REPO ${REPOSITORY}"
+docker compose up -d --build
-# echo "ACCESS_TOKEN ${ACCESS_TOKEN}"
+# docker compose up -d --build --scale github-runner=2
-
-REG_TOKEN=$(curl -X POST -H "Authorization: token ${ACCESS_TOKEN}" -H "Accept: application/vnd.github+json" https://api.github.com/repos/${REPOSITORY}/actions/runners/registration-token | jq .token --raw-output)
-
-cd /home/docker/actions-runner
-
-./config.sh --url https://github.com/${REPOSITORY} --token ${REG_TOKEN} --labels ${LABELS}
-
-cleanup() {
-    echo "Removing runner..."
-    ./config.sh remove --unattended --token ${REG_TOKEN}
-}
-
-trap 'cleanup; exit 130' INT
-trap 'cleanup; exit 143' TERM
-
-./run.sh & wait $!