Reliability and modernisation improvements

Dockerfile

@@ -2,7 +2,7 @@
 FROM ubuntu:22.04
 
 # set the github runner version
-ARG RUNNER_VERSION="2.311.0"
+ARG RUNNER_VERSION="2.317.0"
 
 ENV TZ=Europe/Lisbon
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -27,7 +27,8 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -; \
 # cd into the user directory, download and unzip the github actions runner
 RUN cd /home/docker && mkdir actions-runner && cd actions-runner \
     && curl -O -L https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz \
-    && tar xzf ./actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz
+    && tar xzf ./actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz \
+    && rm ./actions-runner-linux-x64-${RUNNER_VERSION}.tar.gz
 
 # install some additional dependencies
 RUN chown -R docker ~docker && /home/docker/actions-runner/bin/installdependencies.sh

docker-compose.yml

@@ -1,4 +1,8 @@
-version: "3.9"
+secrets:
+  # Note: Github personal access token
+  #       Not the token for registering self-hosted runner
+  github_access-token:
+    file: ./access-token
 
 services:
   socket:
@@ -14,15 +18,21 @@ services:
       INFO: 1
       SESSION: 1
       CONFIGS: 1
+    healthcheck:
+      # Test on docker healthcheck endpoint
+      test: [ "CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost:2375/v1.35/_ping" ]
+      interval: 10s
+      timeout: 10s
+      retries: 3
+      start_period: 30s
+      start_interval: 2s
 
   runner:
     build:
       context: .
+    secrets:
+      - github_access-token
     env_file: .env
     environment:
       DOCKER_HOST: socket:2375
       ACCESS_TOKEN_FILE: /run/secrets/github_access-token
-
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./access-token:/run/secrets/github_access-token:ro

start.sh

@@ -1,20 +1,20 @@
 #!/bin/bash
 
 ORGANIZATION=$ORGANIZATION
-ACCESS_TOKEN=$(cat $ACCESS_TOKEN_FILE)
-
-REG_TOKEN=$(curl -sX POST -H "Authorization: token ${ACCESS_TOKEN}" https://api.github.com/orgs/${ORGANIZATION}/actions/runners/registration-token | jq .token --raw-output)
+REG_TOKEN=$(curl -sX POST -H "Authorization: token $(cat $ACCESS_TOKEN_FILE)" https://api.github.com/orgs/${ORGANIZATION}/actions/runners/registration-token | jq .token --raw-output)
 
 cd /home/docker/actions-runner
 
-./config.sh --url https://github.com/${ORGANIZATION} --token ${REG_TOKEN} --ephemeral
+echo "Configuring ephemeral runner..."
+./config.sh --url https://github.com/${ORGANIZATION} --token ${REG_TOKEN} --ephemeral --disableupdate
 
 cleanup() {
   echo "Removing runner..."
-  ./config.sh remove --unattended --token ${REG_TOKEN}
+  ./config.sh remove --token ${REG_TOKEN}
 }
 
 trap 'cleanup; exit 130' INT
 trap 'cleanup; exit 143' TERM
 
+echo "Beginning run script..."
 ./run.sh & wait $!