Merge pull request #25 from fullstack-devops/bugfix/update-ghr-to-v2.292.0

update to ghr v2.292.0

Author: eksrha

README.md

@@ -13,11 +13,11 @@ Package / Images: `ghcr.io/fullstack-devops/github-actions-runner`
 
 Available Tags:
 | Name (tag)              | Installed Tools/ Software                                                                                 | Description                                                                                                                        |
-|-------------------------|-----------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
+| ----------------------- | --------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
 | `latest-base`           | libffi-dev, libicu-dev, build-essential, libssl-dev, ca-certificates, jq, sed, grep, git, curl, wget, zip | Base runner with nothing fancy installed <br> [Dockerfile](images/base/Dockerfile)                                                 |
 | `latest-kaniko-sidecar` | kaniko                                                                                                    | Sidecar used by other runner images to build containers without root privileges                                                    |
 | `latest-ansible-k8s`    | base-image + ansible, helm, kubectl, skopeo                                                               | Runner specialized for automated k8s deployments via ansible <br> For more Details see [Dockerfile](images/ansible-k8s/Dockerfile) |
-| `latest-fullstacked`    | base-image + maven, openjdk-11, nodejs, go, yarn, angular/cli, helm                                       | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile)   |
+| `latest-fullstacked`    | base-image + ansible, helm, maven, openjdk-11, nodejs, go, yarn, angular/cli                              | Runner with a bunch of tools to build your hole application<br> For more Details see [Dockerfile](images/fullstacked/Dockerfile)   |
 
 > Hint: `latest` can be replaced with an specific release version for more stability in your environment.
 
@@ -28,7 +28,7 @@ Available Tags:
 ### Required environmental variables
 
 | Variable          | Type   | Description                                                                                                       |
-|-------------------|--------|-------------------------------------------------------------------------------------------------------------------|
+| ----------------- | ------ | ----------------------------------------------------------------------------------------------------------------- |
 | `GH_ORG`          | string | Points to the GitHub Organisation where the runner should be installed                                            |
 | `GH_ACCESS_TOKEN` | string | Developer Token vor the GitHub Organisation<br> This Token can be personal and is onlv needed during installation |
 
@@ -37,7 +37,7 @@ Available Tags:
 For the helm values see the [values.yaml](https://github.com/fullstack-devops/helm-charts/blob/main/charts/github-actions-runner/values.yaml), section `envValues`
 
 | Variable          | Type   | Default                  | Description                                                          |
-|-------------------|--------|--------------------------|----------------------------------------------------------------------|
+| ----------------- | ------ | ------------------------ | -------------------------------------------------------------------- |
 | `GH_URL`          | string | `https://github.com`     | For GitHub Enterprise support                                        |
 | `GH_API_ENDPOINT` | string | `https://api.github.com` | For GitHub Enterprise support eg.: `https://git.example.com/api/v3/` |
 | `GH_REPO`         | string |                          | installing a runner to a spezific repository                         |

images/base/Dockerfile

@@ -12,7 +12,7 @@ ENV GH_RUNNER_WORKDIR="/home/${USERNAME}"
 ENV GH_KANIKO_WORKDIR="/kaniko/workspace"
 
 # https://github.com/actions/runner/releases
-ENV GH_RUNNER_VERSION=2.291.1
+ENV GH_RUNNER_VERSION=2.292.0
 ENV GH_RUNNER_LABELS=ubuntu-20.04
 
 ENV AWESOME_CI_VERSION 0.11.6

images/base/helper-scripts/gh-entrypoint.sh

@@ -25,10 +25,8 @@ fi
 # access details
 if [ ! -z "$RUNNER_TOKEN" ]; then
     readonly REG_TOKEN=$RUNNER_TOKEN
-    unset RUNNER_TOKEN
 elif [ ! -z $GH_ACCESS_TOKEN ]; then
     readonly REG_TOKEN=$(curl -s -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $GH_ACCESS_TOKEN" $RUNNER_REG_TOKEN_URL | jq .token --raw-output)
-    unset GH_ACCESS_TOKEN
 else
     echo "Please provide one of the Environment Variables:"
     echo "GH_ACCESS_TOKEN, RUNNER_TOKEN"
@@ -65,6 +63,11 @@ echo "Runner configured"
 
 cleanup() {
     echo "Removing runner..."
+    if [ ! -z "$RUNNER_TOKEN" ]; then
+        readonly REG_TOKEN=$RUNNER_TOKEN
+    else [ ! -z $GH_ACCESS_TOKEN ]; then
+        readonly REG_TOKEN=$(curl -s -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: token $GH_ACCESS_TOKEN" $RUNNER_REG_TOKEN_URL | jq .token --raw-output)
+    fi
     ${RUNNER_HOME}/config.sh remove --token ${REG_TOKEN}
     exit 1
 }