From 160768bda9d4108344f9d0e91be437a0e7512976 Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Fri, 24 Feb 2023 11:51:10 +0100
Subject: [PATCH 1/5] fix some typo

---
 .github/workflows/create-release.yml | 4 ++++
 README.md                            | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index d13c0fa..4594fad 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -8,6 +8,10 @@ on:
   push:
     branches:
       - "main"
+    paths-ignore:
+      - "docs/**"
+      - "CHANGELOG.md"
+      - "README.md"
 
 env:
   IMAGE_NAME: "${{ github.repository_owner }}/github-actions-runner"
diff --git a/README.md b/README.md
index e48d1d1..9d05a74 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Available Tags:
 | Variable                               | Type   | Description                                                                                                       |
 | -------------------------------------- | ------ | ----------------------------------------------------------------------------------------------------------------- |
 | `GH_ORG`, `GH_REPO` or `GH_ENTERPRISE` | string | Points to the GitHub enterprise, organisation or repo 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 |
+| `GH_ACCESS_TOKEN`                      | string | Developer Token vor the GitHub Organisation<br></br> This Token can be personal and is onlv needed during installation |
 
 ### Optional environmental variables
 

From 7b0f3c6a564f5de9fa06185ef81f4d8f23c54449 Mon Sep 17 00:00:00 2001
From: Eike Haller <58111764+eksrha@users.noreply.github.com>
Date: Mon, 13 Mar 2023 17:30:07 +0100
Subject: [PATCH 2/5] fix: remove maven 3.6 add maven 3.9 (#64)

---
 images/maven-temurin-17/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/images/maven-temurin-17/Dockerfile b/images/maven-temurin-17/Dockerfile
index fa47a6d..1b24043 100644
--- a/images/maven-temurin-17/Dockerfile
+++ b/images/maven-temurin-17/Dockerfile
@@ -1,9 +1,8 @@
 FROM ghcr.io/fullstack-devops/github-actions-runner:latest-base
 
 USER root
-# install packages along with jq so we can parse JSON
 # add additional packages as necessary
-ARG PACKAGES="temurin-17-jdk xmlstarlet maven"
+ARG PACKAGES="temurin-17-jdk xmlstarlet"
 ARG PACKAGES_PYTHON="kubernetes"
 
 RUN apt-get update \
@@ -11,6 +10,11 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
+# maven version > 3.6 is still not in ubuntu package managemant
+ENV MAVEN_VERSION=3.9.0
+RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -xzC /opt/ \
+  && ln -s /opt/apache-maven-3.9.0/bin/mvn /usr/bin/mvn
+
 # make cacerts for user accessable
 RUN chmod 666 /usr/lib/jvm/temurin*/lib/security/cacerts
 

From 6b849532f354a5321c948e9afc0dd3d2b6b7664c Mon Sep 17 00:00:00 2001
From: Eike Haller <58111764+eksrha@users.noreply.github.com>
Date: Wed, 17 May 2023 11:13:33 +0200
Subject: [PATCH 3/5] general update + fix golang (#65)

---
 images/ansible-k8s/Dockerfile      | 2 +-
 images/base/Dockerfile             | 6 +++---
 images/golang/Dockerfile           | 6 +++---
 images/maven-adopt-8-ng/Dockerfile | 2 +-
 images/maven-temurin-11/Dockerfile | 2 +-
 images/maven-temurin-17/Dockerfile | 4 ++--
 images/ng-cli-karma/Dockerfile     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/images/ansible-k8s/Dockerfile b/images/ansible-k8s/Dockerfile
index 9573d2d..04e0587 100644
--- a/images/ansible-k8s/Dockerfile
+++ b/images/ansible-k8s/Dockerfile
@@ -14,7 +14,7 @@ ENV GH_RUNNER_LABELS="ubuntu-20.04,ansible-k8s"
 # https://github.com/kubernetes/kubernetes/releases/
 ARG KUBECTL_VERSION=1.23.5
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 
 COPY --from=build /go/src/github.com/containers/skopeo/bin/skopeo /usr/local/bin/skopeo
 COPY --from=build /go/src/github.com/containers/skopeo/default-policy.json /etc/containers/policy.json
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 7ab061a..aa4d5d8 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -18,13 +18,13 @@ ENV GH_RUNNER_WORKDIR="/home/$USERNAME"
 ENV GH_KANIKO_WORKDIR="/kaniko/workspace"
 
 # https://github.com/actions/runner/releases
-ENV GH_RUNNER_VERSION=2.302.1
+ENV GH_RUNNER_VERSION=2.304.0
 ENV GH_RUNNER_LABELS=ubuntu-20.04
 
 # https://github.com/fullstack-devops/awesome-ci/releases
-ENV AWESOME_CI_VERSION 1.2.0
+ENV AWESOME_CI_VERSION 1.2.4
 # https://github.com/samuong/alpaca/releases
-ENV ALPACA_VERSION 1.3.2
+ENV ALPACA_VERSION 2.0.2
 
 # making nessecarry directories
 RUN mkdir /helper-scripts \
diff --git a/images/golang/Dockerfile b/images/golang/Dockerfile
index 33874d9..7f807d5 100644
--- a/images/golang/Dockerfile
+++ b/images/golang/Dockerfile
@@ -4,9 +4,9 @@ USER root
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,nodejs,golang,helm,ansible"
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 # https://go.dev/dl/
-ARG GO_VERSION=1.19
+ARG GO_VERSION=1.20.4
 
 # Install helm
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
@@ -16,7 +16,7 @@ RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
 # install build tools for golang
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
   && wget https://golang.org/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz -O /usr/local/src/go.linux.tar.gz \
-  && tar -xf /usr/local/src/go.linux.tar.gz \
+  && tar -C /usr/local/src -xzf /usr/local/src/go.linux.tar.gz \
   && rm -rf /usr/local/src/go.linux.tar.gz \
   && ln -s /usr/local/src/go/bin/go /usr/local/bin/
 
diff --git a/images/maven-adopt-8-ng/Dockerfile b/images/maven-adopt-8-ng/Dockerfile
index ec14924..5331ac1 100644
--- a/images/maven-adopt-8-ng/Dockerfile
+++ b/images/maven-adopt-8-ng/Dockerfile
@@ -19,7 +19,7 @@ RUN chmod 666 /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,openjdk-8,nodejs,go,yarn,helm,ansible"
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 
 # Install helm
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
diff --git a/images/maven-temurin-11/Dockerfile b/images/maven-temurin-11/Dockerfile
index 97a3e4c..3ceb383 100644
--- a/images/maven-temurin-11/Dockerfile
+++ b/images/maven-temurin-11/Dockerfile
@@ -16,7 +16,7 @@ RUN chmod 666 /usr/lib/jvm/temurin*/lib/security/cacerts
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,temurin-11,helm,ansible"
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 
 # Install helm
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
diff --git a/images/maven-temurin-17/Dockerfile b/images/maven-temurin-17/Dockerfile
index 1b24043..3084c24 100644
--- a/images/maven-temurin-17/Dockerfile
+++ b/images/maven-temurin-17/Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
   && apt-get clean
 
 # maven version > 3.6 is still not in ubuntu package managemant
-ENV MAVEN_VERSION=3.9.0
+ENV MAVEN_VERSION=3.9.2
 RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -xzC /opt/ \
   && ln -s /opt/apache-maven-3.9.0/bin/mvn /usr/bin/mvn
 
@@ -20,7 +20,7 @@ RUN chmod 666 /usr/lib/jvm/temurin*/lib/security/cacerts
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,temurin-17,helm,ansible"
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 
 # Install helm
 RUN export ARCH=$(/helper-scripts/translate-aarch.sh a-short) \
diff --git a/images/ng-cli-karma/Dockerfile b/images/ng-cli-karma/Dockerfile
index dea6f5e..2ccfda6 100644
--- a/images/ng-cli-karma/Dockerfile
+++ b/images/ng-cli-karma/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update \
 
 ENV GH_RUNNER_LABELS="ubuntu-20.04,nodejs,yarn,karma,chrome,helm,ansible"
 # https://github.com/helm/helm/releases
-ARG HELM_VERSION=3.8.1
+ARG HELM_VERSION=3.12.0
 # https://go.dev/dl/
 ARG GO_VERSION=1.18
 

From 4c502992d241bb8d9e62d7dceb378969a7d21e1e Mon Sep 17 00:00:00 2001
From: Eike Haller <58111764+eksrha@users.noreply.github.com>
Date: Wed, 17 May 2023 12:01:23 +0200
Subject: [PATCH 4/5] add golang install to path (#66)

---
 images/golang/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/images/golang/Dockerfile b/images/golang/Dockerfile
index 7f807d5..2b10700 100644
--- a/images/golang/Dockerfile
+++ b/images/golang/Dockerfile
@@ -24,6 +24,8 @@ RUN chown -R $USERNAME /home/$USERNAME
 
 USER $USERNAME
 
+ENV PATH=$PATH:/home/runner/go/bin
+
 # install helm plugins helm push, appr && diff
 RUN helm plugin install --version 0.10.3 https://github.com/chartmuseum/helm-push.git \
   && helm plugin install --version 0.7.0 https://github.com/app-registry/appr-helm-plugin.git \

From 2c1454fc6402b6441d97d6a59c62fcc553540c49 Mon Sep 17 00:00:00 2001
From: Eike Haller <58111764+eksrha@users.noreply.github.com>
Date: Thu, 6 Jul 2023 17:06:47 +0200
Subject: [PATCH 5/5] Update Dockerfile (#67)

---
 images/maven-temurin-17/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/images/maven-temurin-17/Dockerfile b/images/maven-temurin-17/Dockerfile
index 3084c24..a58d114 100644
--- a/images/maven-temurin-17/Dockerfile
+++ b/images/maven-temurin-17/Dockerfile
@@ -11,9 +11,9 @@ RUN apt-get update \
   && apt-get clean
 
 # maven version > 3.6 is still not in ubuntu package managemant
-ENV MAVEN_VERSION=3.9.2
+ENV MAVEN_VERSION=3.9.3
 RUN curl -fsSL https://dlcdn.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries/apache-maven-${MAVEN_VERSION}-bin.tar.gz | tar -xzC /opt/ \
-  && ln -s /opt/apache-maven-3.9.0/bin/mvn /usr/bin/mvn
+  && ln -s /opt/apache-maven-${MAVEN_VERSION}/bin/mvn /usr/bin/mvn
 
 # make cacerts for user accessable
 RUN chmod 666 /usr/lib/jvm/temurin*/lib/security/cacerts