Merge branch 'main' into feature/docker-container

Author: jonpugh

.github/workflows/tests.yml

@@ -26,25 +26,33 @@ jobs:
 
     strategy:
       matrix:
-        runner: [1,2,3,4,5]
+        runner: [1,2,3]
     steps:
       - uses: actions/checkout@v4
 
       - name: Debug
         run: |
-          echo "Who am I: $(whoami)"
-          echo "Hostname: $(hostname -f)"
-          echo "Environment:"
-          env
+          echo "Who am I: $(whoami)@$(hostname -f)"
+          echo "Where am I: $(pwd)"
+          echo "Env:"
+          env | grep GITHUB
 
       - name: Help
         run: |
           echo "Hi from .github/workflows/tests.yml!"
-          ./github-runner --help
+          ./github-runner-installer --help
 
       - name: Run
         run: |
-          ./github-runner \
+          ./github-runner-installer \
+            --run \
+            --name=${RUNNER_CONFIG_NAME} \
+            --config-sh-options=--ephemeral
+
+      - name: Run again
+        run: |
+          ./github-runner-installer \
+            --run \
             --name=${RUNNER_CONFIG_NAME} \
             --config-sh-options=--ephemeral
 
@@ -53,7 +61,7 @@ jobs:
     runs-on: "jonpugh@github-runner.${{ github.run_id }}"
     strategy:
       matrix:
-        runner: [1,2,3,4,5]
+        runner: [1,2,3,4,5,6]
     steps:
       - uses: actions/checkout@v4
 
@@ -63,3 +71,7 @@ jobs:
           echo "Hostname: $(hostname -f)"
           echo "Environment:"
           env
+
+      - name: A second task
+        run: |
+          echo "Confirmed."

Dockerfile

@@ -10,16 +10,21 @@ RUN yum install -y \
     jq
 
 # This codebase. The runner wrapper script.
-COPY ./ /github-runner
-WORKDIR /github-runner
+COPY ./ /github-runner-installer
+WORKDIR /github-runner-installer
 RUN chown runner:runner . -R
 
 # GitHub Runner code.
 # Install runner to a path that won't ever be in a volume.
 ENV RUNNER_PATH /usr/share/github-runner
-# We are installing as root then switching back because we need to use the install-dependencies script.
-RUN ./github-runner --no-run --no-config --runner-path=${RUNNER_PATH}
-RUN ${RUNNER_PATH}/bin/installdependencies.sh
-RUN chown runner:runner ${RUNNER_PATH} -R
 
+# Install Dependencies
+RUN curl https://raw.githubusercontent.com/actions/runner/refs/tags/v2.326.0/src/Misc/layoutbin/installdependencies.sh -o install-dependencies \
+    && bash install-dependencies
+
+# Run github-runner-installer script.
+#RUN ./github-runner-installer --no-run --no-config --runner-path=${RUNNER_PATH}
+
+# Change runner ownership & Switch user.
+# RUN chown runner:runner ${RUNNER_PATH} -R
 USER runner

README.md

@@ -1,2 +1,2 @@
-# github-runner
+# github-runner-installer
 A single script to install, configure, launch, and cleanup GitHub runners.

composer.json

@@ -11,6 +11,6 @@
     ],
     "require": {},
     "bin": [
-        "github-runner"
+        "github-runner-installer"
     ]
 }

docker-compose.yml

@@ -7,13 +7,13 @@ services:
     image: jonpugh/github-runner
     hostname: localhost
     volumes:
-      - ./:/github-runner
+      - ./:/github-runner-installer
     environment:
       GITHUB_TOKEN: ${GITHUB_TOKEN}
-      GITHUB_REPOSITORY: jonpugh/github-runner
+      GITHUB_REPOSITORY: operations-project/github-runner-installer
       RUNNER_CONFIG_LABELS: ${RUNNER_CONFIG_LABELS:-runner@localhost}
     entrypoint: ./docker-entrypoint
-    command: ./github-runner
+    command: ./github-runner-installer
     build: ./
 
     # Give the containers more time to shutdown before being cancelled.

github-runner github-runner-installergithub-runner renamed to github-runner-installer

@@ -9,7 +9,7 @@ start() {
 
 
   if [[ -n $RUNNER_CONFIG ]]; then
-    say Launching runner with run.sh ...
+    say Configuring runner with config.sh ...
     line
     configure
   else
@@ -30,8 +30,8 @@ start() {
     wait $RUNNER_PID
 
   else
-    say Launching runner with run.sh ... SKIPPED.
-    say Exiting github-runner.
+    say Skipped running due to --no-run option.
+    say Exiting github-runner-installer.
   fi
 
 }
@@ -52,6 +52,9 @@ info() {
   say "Repo: ${RUNNER_URL_REPO}"
   say "Labels: ${RUNNER_CONFIG_LABELS}"
   say "Status: ${RUNNER_URL_RUNNERS}"
+  line
+  say "Run: ${RUNNER_RUN:-no}"
+
 }
 usage() {
   say GitHub Runner Script
@@ -61,7 +64,7 @@ usage() {
   echo "--repo (GITHUB_REPOSITORY) The GitHub repo to install the runner on. (eg. owner/repo)"
   echo "--name (RUNNER_CONFIG_NAME) The name to give the runner. (Default: $(whoami)@$(hostname -f))"
   echo "--labels (RUNNER_CONFIG_LABELS) A list of labels to assign to the runner. (Default: $(whoami)@$(hostname -f))"
-  echo "--no-run (RUNNER_RUN)    If empty, don't run."
+  echo "--run (RUNNER_RUN) Launch the runner with run.sh after installing."
   echo "--config-sh-options (RUNNER_CONFIG_OPTIONS) Pass options to the github runner config.sh command."
 }
 verify() {
@@ -76,9 +79,9 @@ verify() {
   # Detect path to this script.
   # @TODO: Rename RUNNER_SCRIPT_ to reduce confusion with github runner CLI
   if [[ -z "$COMPOSER_RUNTIME_BIN_DIR" ]]; then
-    RUNNER_SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/github-runner"
+    RUNNER_SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/github-runner-installer"
   else
-    RUNNER_SCRIPT_PATH="$COMPOSER_RUNTIME_BIN_DIR/github-runner"
+    RUNNER_SCRIPT_PATH="$COMPOSER_RUNTIME_BIN_DIR/github-runner-installer"
   fi
   if [[ ! -f "${RUNNER_SCRIPT_PATH}" ]]; then
      say "Path detection failed."
@@ -90,11 +93,11 @@ verify() {
   # Defaults. If ENV vars exist, use them. If not, use these values.
   RUNNER_PATH=${RUNNER_PATH:-"runner"}
   RUNNER_CONFIG_NAME=${RUNNER_CONFIG_NAME:-$(whoami)@$(hostname -f)}
-  RUNNER_CONFIG_LABELS=${RUNNER_CONFIG_LABELS:-"jonpugh/github-runner"}
+  RUNNER_CONFIG_LABELS=${RUNNER_CONFIG_LABELS:-"operations-project/github-runner-installer"}
   RUNNER_CONFIG_OPTIONS=${RUNNER_CONFIG_OPTIONS:-""}
 
   # Whether to run the runner
-  RUNNER_RUN=${RUNNER_RUN:-"yes"}
+  RUNNER_RUN=${RUNNER_RUN:-""}
   RUNNER_CONFIG=${RUNNER_CONFIG:-"yes"}
 
   # Command line Options
@@ -132,8 +135,8 @@ verify() {
              RUNNER_CONFIG_OPTIONS="${1#*=}"
              ;;
 
-          --no-run)
-              RUNNER_RUN=""
+          --run)
+              RUNNER_RUN="yes"
               ;;
 
           --no-config)
@@ -229,6 +232,20 @@ currentArchitecture() {
           ;;
   esac
 }
+currentArchitecture() {
+  architecture=$(uname -m)
+  case "$architecture" in
+      x86_64)
+          echo "x64"
+          ;;
+      aarch64 | arm64)
+          echo "arm64"
+          ;;
+      *)
+          exit 1
+          ;;
+  esac
+}
 latestVersion() {
   RUNNER_CLI_REPO=actions/runner
   curl -s -L \
@@ -275,15 +292,7 @@ download() {
 configure() {
   line
   say Configuring GitHub runner...
-  say Removing existing runner...
-
-  # Remove
-  # @TODO: If runner has a job, wait for it to complete.
   cd $RUNNER_FOLDER
-  ./config.sh remove --token ${RUNNER_CONFIG_TOKEN} || say "config remove didn't work."
-
-  line
-  say Configuring new runner...
 
   # Configure
   CMD="./config.sh \
@@ -299,11 +308,9 @@ configure() {
   say $CMD
   line
 
-  $CMD
+  $CMD && say GitHub runner configured! || say GitHub Runner Config failed. Moving on...
 
   line
-  say GitHub runner configured:
-  info
 
 }
 
@@ -329,7 +336,7 @@ cancel() {
   exit 1
 }
 say() {
-  echo " github-runner | ${*}"
+  echo " github-runner-installer | ${*}"
 }
 line() {
   CHARACTER="${CHARACTER:--}"