From e15125f0ee4cf7605ed12ca1f41b5e9aa27f7e1e Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Tue, 12 Jul 2022 15:14:50 +0200
Subject: [PATCH] add detect-setup + polishing flavours

---
 images/base/Dockerfile                      |  1 +
 images/base/helper-scripts/detect-setup.sh  | 23 +++++++++++++++++++++
 images/base/helper-scripts/gh-entrypoint.sh |  3 +++
 images/maven-adopt-8-ng/Dockerfile          | 11 ++++++----
 images/maven-temurin-11/Dockerfile          |  4 ++--
 5 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 images/base/helper-scripts/detect-setup.sh

diff --git a/images/base/Dockerfile b/images/base/Dockerfile
index 51ca9dd..92b4608 100644
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@@ -26,6 +26,7 @@ RUN mkdir /helper-scripts \
   && mkdir -p /kaniko/workspace
 
 # Copy image helper scripts
+COPY ./helper-scripts/detect-setup.sh /helper-scripts/detect-setup.sh
 COPY ./helper-scripts/gh-entrypoint.sh /helper-scripts/gh-entrypoint.sh
 COPY ./helper-scripts/kaniko-wrapper.sh /helper-scripts/kaniko-wrapper.sh
 COPY ./helper-scripts/translate-aarch.sh /helper-scripts/translate-aarch.sh
diff --git a/images/base/helper-scripts/detect-setup.sh b/images/base/helper-scripts/detect-setup.sh
new file mode 100644
index 0000000..3d4e7fc
--- /dev/null
+++ b/images/base/helper-scripts/detect-setup.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+CA_FILE="/etc/ssl/certs/ca-certificates.crt"
+
+# yarn
+if command -v yarn -v &> /dev/null; then
+    echo "add $CA_FILE to yarn"
+    yarn config set cafile $CA_FILE
+fi
+
+# java
+if command -v java --version &> /dev/null; then
+    echo "add $CA_FILE to yarn"
+    keytool -importcert -alias $CA_FILE -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $CA_FILE -noprompt
+fi
+
+# maven
+if command -v mvn -v &> /dev/null; then
+    if [ -f /mnt/dynamic/settings.xml ]; then
+        echo "linking settings.xml from /mnt/dynamic/settings.xml to ${HOME}/.m2/settings.xml"
+        ln -s /mnt/dynamic/settings.xml ${HOME}/.m2/settings.xml
+    fi
+fi
\ No newline at end of file
diff --git a/images/base/helper-scripts/gh-entrypoint.sh b/images/base/helper-scripts/gh-entrypoint.sh
index 133449f..ebbc45d 100755
--- a/images/base/helper-scripts/gh-entrypoint.sh
+++ b/images/base/helper-scripts/gh-entrypoint.sh
@@ -51,6 +51,9 @@ echo "Connecting runner to:       $RUNNER_URL"
 echo "Individual Runner Name:     $HOSTNAME"
 echo "Runner Home:                $RUNNER_HOME"
 
+echo "Running setup fpr installed software..."
+/helper-scripts/detect-setup.sh
+
 ${RUNNER_HOME}/config.sh \
     --name $HOSTNAME \
     --token $REG_TOKEN \
diff --git a/images/maven-adopt-8-ng/Dockerfile b/images/maven-adopt-8-ng/Dockerfile
index e34ec7b..e07cfeb 100644
--- a/images/maven-adopt-8-ng/Dockerfile
+++ b/images/maven-adopt-8-ng/Dockerfile
@@ -3,12 +3,15 @@ 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="openjdk-11-jdk maven nodejs ansible"
+ARG PACKAGES="adoptopenjdk-8-hotspot xmlstarlet maven nodejs ansible"
 ARG PACKAGES_PYTHON="kubernetes"
 
 ## ansible keys
-RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
-RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+  && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+## adoptopenjdk keys
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - \
+  && echo "deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ focal main" >> /etc/apt/sources.list
 
 RUN apt-get update \
   && add-apt-repository -y --update ppa:ansible/ansible \
@@ -17,7 +20,7 @@ RUN apt-get update \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get clean
 
-ENV GH_RUNNER_LABELS="ubuntu-20.04,maven,openjdk-11,nodejs,go,yarn,helm,ansible"
+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
 
diff --git a/images/maven-temurin-11/Dockerfile b/images/maven-temurin-11/Dockerfile
index 0ebe0dc..c50d8bd 100644
--- a/images/maven-temurin-11/Dockerfile
+++ b/images/maven-temurin-11/Dockerfile
@@ -7,8 +7,8 @@ ARG PACKAGES="temurin-11-jdk maven nodejs ansible"
 ARG PACKAGES_PYTHON="kubernetes"
 
 ## ansible keys
-RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add -
-RUN echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
+RUN wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - \
+  && echo "deb https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list
 
 RUN apt-get update \
   && add-apt-repository -y --update ppa:ansible/ansible \