Bump to version 2.267.0

Optimize base

.github/workflows/base.yml

@@ -19,7 +19,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Login
@@ -37,7 +37,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile
@@ -57,7 +57,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile

.github/workflows/deploy.yml

@@ -20,7 +20,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Login
@@ -38,7 +38,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile
@@ -58,7 +58,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile

.github/workflows/release.yml

@@ -35,7 +35,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Login
@@ -56,7 +56,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile
@@ -79,7 +79,7 @@ jobs:
       id: buildx
       uses: crazy-max/ghaction-docker-buildx@v1
       with:
-        version: latest
+        buildx-version: latest
     - name: Available platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Copy Dockerfile

Dockerfile

@@ -2,7 +2,7 @@
 FROM myoung34/github-runner-base:latest
 LABEL maintainer="myoung34@my.apsu.edu"
 
-ARG GH_RUNNER_VERSION="2.263.0"
+ARG GH_RUNNER_VERSION="2.267.0"
 ARG TARGETPLATFORM
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -14,6 +14,8 @@ RUN chmod +x /actions-runner/install_actions.sh \
   && /actions-runner/install_actions.sh ${GH_RUNNER_VERSION} ${TARGETPLATFORM} \
   && rm /actions-runner/install_actions.sh
 
+COPY token.sh /
+RUN chmod +x /token.sh
 COPY entrypoint.sh /
 RUN chmod +x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

Dockerfile.base

@@ -8,6 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 # hadolint ignore=DL3003
 RUN apt-get update && \
   apt-get install -y --no-install-recommends \
+    awscli \
     curl \
     tar \
     apt-transport-https \
@@ -22,7 +23,6 @@ RUN apt-get update && \
     libcurl4-openssl-dev \
     inetutils-ping \
     jq \
-  && rm -rf /var/lib/apt/lists/* \
   && c_rehash \
   && cd /tmp \
   && curl -sL https://www.kernel.org/pub/software/scm/git/git-${GIT_VERSION}.tar.gz -o git.tgz \
@@ -32,13 +32,11 @@ RUN apt-get update && \
   && make \
   && make install \
   && cd / \
-  && rm -rf /tmp/git.tgz /tmp/git-${GIT_VERSION}
-
-RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
-  && [[ $(lsb_release -cs) == "eoan" ]] && ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu disco stable" ) || ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" )\
+  && curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
+  && [[ $(lsb_release -cs) == "eoan" ]] && ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu disco stable" ) || ( add-apt-repository "deb [arch=$(dpkg --print-architecture)] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" ) \
   && apt-get update \
   && apt-get install -y docker-ce docker-ce-cli containerd.io --no-install-recommends \
-  && rm -rf /var/lib/apt/lists/*
-
-RUN curl -sL "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
-  && chmod +x /usr/local/bin/docker-compose
+  && curl -sL "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose \
+  && chmod +x /usr/local/bin/docker-compose \
+  && rm -rf /var/lib/apt/lists/* \
+  && rm -rf /tmp/*

README.md

@@ -8,11 +8,12 @@ This will run the [new self-hosted github actions runners](https://help.github.c
 This has been tested and verified on:
 
  * x86_64
- * armhf
  * armv7
  * arm64
  
-**NOTE: Only one runner can use the same RUNNER_WORKDIR if it is shared storage.**
+**NOTE:**
+- **Only one runner can use the same RUNNER_WORKDIR if it is shared storage.**
+- **RUNNER_WORKDIR must match the source path for the bind-mounted volume at RUNNER_WORKDIR, in order for container actions to access files.**
 
 ## Examples ##
 
@@ -25,9 +26,8 @@ If you're using a RHEL based OS with SELinux, add `--security-opt=label=disable`
 ```
 # org runner 
 docker run -d --restart always --name github-runner \
-  -e REPO_URL="https://github.com/myoung34/repo" \
-  -e RUNNER_NAME="foo-runner" \
-  -e RUNNER_TOKEN="footoken" \
+  -e RUNNER_NAME_PREFIX="myrunner" \
+  -e ACCESS_TOKEN="footoken" \
   -e RUNNER_WORKDIR="/tmp/github-runner-your-repo" \
   -e ORG_RUNNER="true" \
   -e ORG_NAME="octokode" \
@@ -60,8 +60,6 @@ function github-runner {
         -e RUNNER_TOKEN="$2" \
         -e RUNNER_NAME="linux-${repo}" \
         -e RUNNER_WORKDIR="/tmp/github-runner-${repo}" \
-        -e ORG_RUNNER="true" \
-        -e ORG_NAME="octokode" \
         -e LABELS="my-label,other-label" \
         -v /var/run/docker.sock:/var/run/docker.sock \
         -v /tmp/github-runner-${repo}:/tmp/github-runner-${repo} \
@@ -85,8 +83,7 @@ services:
       RUNNER_NAME: example-name
       RUNNER_TOKEN: someGithubTokenHere
       RUNNER_WORKDIR: /tmp/runner/work
-      ORG_RUNNER: true
-      ORG_NAME: example-github-org
+      ORG_RUNNER: false
       LABELS: linux,x64,gpu
     security_opt:
       # needed on SELinux systems to allow docker container to manage other docker containers
@@ -110,12 +107,12 @@ job "github_runner" {
     driver = "docker"
 
     env {
-      REPO_URL = "https://github.com/your-account/your-repo"
-      RUNNER_TOKEN   = "footoken"
-      RUNNER_WORKDIR = "/tmp/github-runner-your-repo"
-      ORG_RUNNER     = "true"
-      ORG_NAME       = "octokode"
-      LABELS         = "my-label,other-label"
+      ACCESS_TOKEN       = "footoken"
+      RUNNER_NAME_PREFIX = "myrunner" \
+      RUNNER_WORKDIR     = "/tmp/github-runner-your-repo"
+      ORG_RUNNER         = "true"
+      ORG_NAME           = "octokode"
+      LABELS             = "my-label,other-label"
     }
 
     config {
@@ -169,6 +166,8 @@ spec:
           value: footoken
         - name: REPO_URL
           value: https://github.com/your-account/your-repo
+        - name: RUNNER_NAME_PREFIX
+          value: foo
         - name: RUNNER_NAME
           valueFrom:
             fieldRef:
@@ -207,7 +206,6 @@ A runner token can be automatically acquired at runtime if `ACCESS_TOKEN` (a Git
 ```
 docker run -d --restart always --name github-runner \
   -e ACCESS_TOKEN="footoken" \
-  -e REPO_URL="https://github.com/myoung34/repo" \
   -e RUNNER_NAME="foo-runner" \
   -e RUNNER_WORKDIR="/tmp/github-runner-your-repo" \
   -e ORG_RUNNER="true" \

entrypoint.sh

@@ -3,40 +3,26 @@
 export RUNNER_ALLOW_RUNASROOT=1
 export PATH=$PATH:/actions-runner
 
-_RUNNER_NAME=${RUNNER_NAME:-default}
+deregister_runner() {
+  echo "Caught SIGTERM. Deregistering runner"
+  _TOKEN=$(bash /token.sh)
+  RUNNER_TOKEN=$(echo "${_TOKEN}" | jq -r .token)
+  ./config.sh remove --token "${RUNNER_TOKEN}"
+  exit
+}
+
+_RUNNER_NAME=${RUNNER_NAME:-${RUNNER_NAME_PREFIX:-github-runner}-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 13 ; echo '')}
 _RUNNER_WORKDIR=${RUNNER_WORKDIR:-/_work}
-_ORG_RUNNER=${ORG_RUNNER:-false}
 _LABELS=${LABELS:-default}
 _SHORT_URL=${REPO_URL}
 
 if [[ -n "${ACCESS_TOKEN}" ]]; then
-    URI=https://api.github.com
-    API_VERSION=v3
-    API_HEADER="Accept: application/vnd.github.${API_VERSION}+json"
-    AUTH_HEADER="Authorization: token ${ACCESS_TOKEN}"
-
-    _PROTO="$(echo "${REPO_URL}" | grep :// | sed -e's,^\(.*://\).*,\1,g')"
-    # shellcheck disable=SC2116
-    _URL="$(echo "${REPO_URL/${_PROTO}/}")"
-    _PATH="$(echo "${_URL}" | grep / | cut -d/ -f2-)"
-    _ACCOUNT="$(echo "${_PATH}" | cut -d/ -f1)"
-    _REPO="$(echo "${_PATH}" | cut -d/ -f2)"
-
-    _FULL_URI="${URI}/repos/${_ACCOUNT}/${_REPO}/actions/runners/registration-token"
-    if [[ ${_ORG_RUNNER} == "true" ]]; then
-      [[ -z ${ORG_NAME} ]] && ( echo "ORG_NAME required for org runners"; exit 1 )
-      _FULL_URI="${URI}/orgs/${ORG_NAME}/actions/runners/registration-token"
-      _SHORT_URL="${_PROTO}github.com/${ORG_NAME}"
-    fi
-    RUNNER_TOKEN="$(curl -XPOST -fsSL \
-      -H "${AUTH_HEADER}" \
-      -H "${API_HEADER}" \
-      "${_FULL_URI}" \
-    | jq -r '.token')"
+  _TOKEN=$(bash /token.sh)
+  RUNNER_TOKEN=$(echo "${_TOKEN}" | jq -r .token)
+  _SHORT_URL=$(echo "${_TOKEN}" | jq -r .short_url)
 fi
 
 echo "Configuring"
-
 ./config.sh \
     --url "${_SHORT_URL}" \
     --token "${RUNNER_TOKEN}" \
@@ -46,4 +32,7 @@ echo "Configuring"
     --unattended \
     --replace
 
+unset RUNNER_TOKEN
+trap deregister_runner SIGINT SIGQUIT SIGTERM
+
 ./bin/runsvc.sh

token.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+_ORG_RUNNER=${ORG_RUNNER:-false}
+
+URI=https://api.github.com
+API_VERSION=v3
+API_HEADER="Accept: application/vnd.github.${API_VERSION}+json"
+AUTH_HEADER="Authorization: token ${ACCESS_TOKEN}"
+
+REPO_URL=${REPO_URL:-${URI}}
+_PROTO="$(echo "${REPO_URL}" | grep :// | sed -e's,^\(.*://\).*,\1,g')"
+# shellcheck disable=SC2116
+_URL="$(echo "${REPO_URL/${_PROTO}/}")"
+_PATH="$(echo "${_URL}" | grep / | cut -d/ -f2-)"
+_ACCOUNT="$(echo "${_PATH}" | cut -d/ -f1)"
+_REPO="$(echo "${_PATH}" | cut -d/ -f2)"
+
+_FULL_URL="${URI}/repos/${_ACCOUNT}/${_REPO}/actions/runners/registration-token"
+if [[ ${_ORG_RUNNER} == "true" ]]; then
+  [[ -z ${ORG_NAME} ]] && ( echo "ORG_NAME required for org runners"; exit 1 )
+  _FULL_URL="${URI}/orgs/${ORG_NAME}/actions/runners/registration-token"
+  _SHORT_URL="${_PROTO}github.com/${ORG_NAME}"
+else
+  _SHORT_URL=$REPO_URL
+fi
+
+RUNNER_TOKEN="$(curl -XPOST -fsSL \
+  -H "${AUTH_HEADER}" \
+  -H "${API_HEADER}" \
+  "${_FULL_URL}" \
+| jq -r '.token')"
+
+echo "{\"token\": \"${RUNNER_TOKEN}\", \"short_url\": \"${_SHORT_URL}\", \"full_url\": \"${_FULL_URL}\"}"