From 412f7e808a97019e682f8d5dba54e530b033cc8a Mon Sep 17 00:00:00 2001
From: eksrha <58111764+eksrha@users.noreply.github.com>
Date: Mon, 13 Feb 2023 17:04:24 +0100
Subject: [PATCH] fix: java cert import > v1.8 + update actions

---
 .github/workflows/build-pr.yml             |  6 +++---
 .github/workflows/create-release.yml       |  4 ++--
 .vscode/extensions.json                    |  5 +++++
 images/base/helper-scripts/detect-setup.sh | 13 ++++++++++---
 4 files changed, 20 insertions(+), 8 deletions(-)
 create mode 100644 .vscode/extensions.json
 mode change 100644 => 100755 images/base/helper-scripts/detect-setup.sh

diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 65f1a32..c359e93 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -48,7 +48,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build github-actions-runner:base
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./images/base
           push: true
@@ -83,9 +83,9 @@ jobs:
           images/${{ matrix.flavour }}/Dockerfile
 
       - name: Build github-actions-runner:${{ matrix.flavour }}
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./images/${{ matrix.flavour }}
-          push: true
+          push: false
           tags: |
             ${{ env.IMAGE_BASE }}:${{ matrix.flavour }}-pr-${{ github.event.pull_request.number }}
diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 163c46b..d13c0fa 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -59,7 +59,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build github-actions-runner:base
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./images/base
           push: true
@@ -98,7 +98,7 @@ jobs:
           images/${{ matrix.flavour }}/Dockerfile
 
       - name: Build github-actions-runner:${{ matrix.flavour }}
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v4
         with:
           context: ./images/${{ matrix.flavour }}
           push: true
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 0000000..15b017a
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "shakram02.bash-beautify"
+    ]
+}
\ No newline at end of file
diff --git a/images/base/helper-scripts/detect-setup.sh b/images/base/helper-scripts/detect-setup.sh
old mode 100644
new mode 100755
index d78da00..985bdf8
--- a/images/base/helper-scripts/detect-setup.sh
+++ b/images/base/helper-scripts/detect-setup.sh
@@ -17,18 +17,25 @@ if command -v java --version &> /dev/null; then
     echo "generating single certs at $javacerts/"
     mkdir -p $javacerts
     cat $CA_FILE | awk 'split_after==1{n++;split_after=0} /-----END CERTIFICATE-----/ {split_after=1} {print > ("/tmp/javacerts/cert" n ".crt")}'
-
+    
     for f in $javacerts/*.crt ; do
         # delete empty lines in files
         sed -i '/^$/d' $f
     done
     # delete empty files to prevent errors at import
     find $javacerts -empty -delete
-
+    
+    java_version=$(java -version 2>&1 | awk -F '"' '/version/ {print $2}')
     for x in $javacerts/*.crt ; do
         alias=$(openssl x509 -noout -subject -in "$x" | awk -F= '{print $NF}' | sed -e 's/^[ \t]*//' | sed -e 's/ /_/g')
         echo "importing cert of $alias"
-        keytool -importcert -alias $alias -keystore /usr/lib/jvm/adoptopenjdk-8-hotspot-amd64/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
+        if [[ "$java_version" > "1.8" ]]; then
+            echo "using java greater 1.8"
+            keytool -importcert -alias $alias -cacerts -storepass changeit -file $x -noprompt
+        else
+            echo "using java lower 1.8"
+            keytool -importcert -alias $alias -keystore /usr/lib/jvm/adopt*/jre/lib/security/cacerts -storepass changeit -file $x -noprompt
+        fi
     done
     rm -rf $javacerts
 fi