SQSCANNER-116 update JDK to version 17

SonarSource · Jul 27, 2023 · 9f8945c · 9f8945c
1 parent 3107e5b
commit 9f8945c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 11 deletions.
diff --git a/.github/workflows/hadolint-analysis.yml b/.github/workflows/hadolint-analysis.yml
@@ -8,7 +8,7 @@ on:
     - '**/Dockerfile'
 
 jobs:
-  v4:
+  v5:
     name: Dockerfile-Linting
     runs-on: ubuntu-latest
     permissions:
@@ -18,5 +18,4 @@ jobs:
     - name: Pull HaDoLint image
       run: docker pull hadolint/hadolint
     - name: Lint Dockerfile
-      run: docker run --rm --interactive hadolint/hadolint hadolint --ignore DL3018 --ignore DL4001 --ignore DL3013 --ignore SC2015 - < ./4/Dockerfile
-
+      run: docker run --rm --interactive hadolint/hadolint hadolint --ignore DL3018 --ignore DL4001 --ignore DL3013 --ignore SC2015 - < ./5/Dockerfile
diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml
@@ -11,10 +11,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        version: [4]
+        version: [5]
         include:
-          - version: 4
-            tag: 4
+          - version: 5
+            tag: 5
     runs-on: ubuntu-latest
     permissions:
       contents: read

diff --git a/.github/workflows/rebuild.yml b/.github/workflows/rebuild.yml
@@ -89,7 +89,7 @@ jobs:
           echo "major_minor_patch=${major}.${minor}.${patch}" >> $GITHUB_OUTPUT
       - name: Build an image from Dockerfile
         run: |
-          docker build "4" \
+          docker build "5" \
             --pull \
             --tag "sonarsource/sonar-scanner-cli:${{ steps.get_version.outputs.major }}" \
             --tag "repox-sonarsource-docker-releases.jfrog.io/sonarsource/sonar-scanner-cli:${{ steps.get_version.outputs.major }}" \
@@ -100,7 +100,7 @@ jobs:
             --tag "sonarsource/sonar-scanner-cli:latest" \
             --tag "repox-sonarsource-docker-releases.jfrog.io/sonarsource/sonar-scanner-cli:latest" \
             --build-arg SONAR_SCANNER_VERSION=${{ steps.latest_release.outputs.tag_name }} \
-            -f 4/Dockerfile
+            -f 5/Dockerfile
       - name: Test image
         run: ./run-tests.sh "sonarsource/sonar-scanner-cli:latest"
       - name: Generate CycloneDX SBOM

diff --git a/4/Dockerfile → 5/Dockerfile b/4/Dockerfile → 5/Dockerfile
@@ -6,7 +6,7 @@ ARG SONAR_SCANNER_HOME=/opt/sonar-scanner
 ARG SONAR_SCANNER_VERSION
 ARG UID=1000
 ARG GID=1000
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk \
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk \
     HOME=/tmp \
     XDG_CONFIG_HOME=/tmp \
     SONAR_SCANNER_HOME=${SONAR_SCANNER_HOME} \
@@ -23,7 +23,7 @@ RUN set -eux; \
     addgroup -S -g ${GID} scanner-cli; \
     adduser -S -D -u ${UID} -G scanner-cli scanner-cli; \
     apk add --no-cache --virtual build-dependencies wget unzip gnupg; \
-    apk add --no-cache git python3 py-pip bash shellcheck 'nodejs>12' openjdk11-jre curl musl-locales musl-locales-lang; \
+    apk add --no-cache git python3 py-pip bash shellcheck 'nodejs>12' openjdk17-jre curl musl-locales musl-locales-lang; \
     wget -U "scannercli" -q -O /opt/sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip; \
     wget -U "scannercli" -q -O /opt/sonar-scanner-cli.zip.asc https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}.zip.asc; \
     for server in $(shuf -e hkps://keys.openpgp.org \

diff --git a/4/bin/entrypoint.sh → 5/bin/entrypoint.sh b/4/bin/entrypoint.sh → 5/bin/entrypoint.sh
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,3 +1,3 @@
 sonar.organization=sonarsource
 sonar.projectKey=SonarSource_sonar-scanner-cli-docker_AYc24KKjsMmHG0qPXLZ9
-sonar.sources=4/
+sonar.sources=5/