From fb07835a5389d1d3238d00f4f60e44b3595bb756 Mon Sep 17 00:00:00 2001 From: nvuillam Date: Sat, 25 Nov 2023 23:46:49 +0100 Subject: [PATCH] Update base java image to openjdk 17 --- Dockerfile | 22 ++++++++++++++++--- flavors/c_cpp/Dockerfile | 12 +++++++++- flavors/ci_light/Dockerfile | 10 ++++++--- flavors/cupcake/Dockerfile | 16 ++++++++++++-- flavors/documentation/Dockerfile | 12 +++++++++- flavors/dotnet/Dockerfile | 12 +++++++++- flavors/dotnetweb/Dockerfile | 12 +++++++++- flavors/go/Dockerfile | 12 +++++++++- flavors/java/Dockerfile | 16 ++++++++++++-- flavors/javascript/Dockerfile | 12 +++++++++- flavors/php/Dockerfile | 12 +++++++++- flavors/python/Dockerfile | 12 +++++++++- flavors/ruby/Dockerfile | 12 +++++++++- flavors/rust/Dockerfile | 12 +++++++++- flavors/salesforce/Dockerfile | 18 ++++++++++++--- flavors/swift/Dockerfile | 16 +++++++++++--- flavors/terraform/Dockerfile | 12 +++++++++- linters/groovy_npm_groovy_lint/Dockerfile | 5 ++++- linters/java_checkstyle/Dockerfile | 4 ++-- linters/java_pmd/Dockerfile | 4 ++-- linters/kotlin_ktlint/Dockerfile | 6 ++++- .../Dockerfile | 4 ++-- .../salesforce_sfdx_scanner_apex/Dockerfile | 4 ++-- .../salesforce_sfdx_scanner_aura/Dockerfile | 4 ++-- .../salesforce_sfdx_scanner_lwc/Dockerfile | 4 ++-- linters/scala_scalafix/Dockerfile | 4 +++- .../groovy.megalinter-descriptor.yml | 5 ++++- .../java.megalinter-descriptor.yml | 4 ++-- .../kotlin.megalinter-descriptor.yml | 5 ++++- .../salesforce.megalinter-descriptor.yml | 4 ++-- .../scala.megalinter-descriptor.yml | 4 +++- 31 files changed, 242 insertions(+), 49 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2c29264dfd..d980e422b8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ RUN apk add --no-cache \ lttng-ust-dev \ zlib \ zlib-dev \ - openjdk11 \ + openjdk17 \ perl \ perl-dev \ gnupg \ @@ -442,9 +442,15 @@ ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet" # "$ALPINE_GLIBC_I18N_PACKAGE_FILENAME" # JAVA installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" +# KOTLIN installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # PHP installation RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \ && export GITHUB_AUTH_TOKEN \ @@ -472,7 +478,7 @@ RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GI # SALESFORCE installation # Next line commented because already managed by another linter -# ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk # Next line commented because already managed by another linter # ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ @@ -481,6 +487,10 @@ RUN sf plugins install @salesforce/plugin-packaging \ && rm -rf /root/.npm/_cacache \ # SCALA installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" && curl --retry-all-errors --retry 10 -fLo coursier https://git.io/coursier-cli && \ chmod +x coursier @@ -558,6 +568,12 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \ # revive installation # Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # checkstyle installation RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ diff --git a/flavors/c_cpp/Dockerfile b/flavors/c_cpp/Dockerfile index 37f8ef4a2dd..e97893a3588 100644 --- a/flavors/c_cpp/Dockerfile +++ b/flavors/c_cpp/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ clang16-extra-tools \ nodejs \ @@ -233,6 +233,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -258,6 +262,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/ci_light/Dockerfile b/flavors/ci_light/Dockerfile index b90f34b1096..c2048785032 100644 --- a/flavors/ci_light/Dockerfile +++ b/flavors/ci_light/Dockerfile @@ -58,7 +58,7 @@ RUN apk add --no-cache \ nodejs \ npm \ yarn \ - openjdk11 \ + openjdk17 \ libc-dev \ libxml2-dev \ libxml2-utils \ @@ -188,7 +188,11 @@ COPY --link --from=trufflehog /usr/bin/trufflehog /usr/bin/ # Managed with COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint # dotenv-linter installation -RUN wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +RUN wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s + +# npm-groovy-lint installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" # checkmake installation # Managed with COPY --link --from=checkmake /checkmake /usr/bin/checkmake @@ -197,7 +201,7 @@ RUN wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/m # Managed with COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/ # grype installation - && curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin v0.63.1 \ +RUN curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b /usr/local/bin v0.63.1 \ # trivy installation && wget --tries=5 -q -O - https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin diff --git a/flavors/cupcake/Dockerfile b/flavors/cupcake/Dockerfile index fea8a9e572c..b8d9cb232a2 100644 --- a/flavors/cupcake/Dockerfile +++ b/flavors/cupcake/Dockerfile @@ -78,7 +78,7 @@ RUN apk add --no-cache \ openssl \ docker \ openrc \ - openjdk11 \ + openjdk17 \ gnupg \ php81 \ php81-phar \ @@ -342,9 +342,15 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases # JAVA installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" +# KOTLIN installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # PHP installation RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \ && export GITHUB_AUTH_TOKEN \ @@ -405,6 +411,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # revive installation # Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # checkstyle installation RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ diff --git a/flavors/documentation/Dockerfile b/flavors/documentation/Dockerfile index 19bd4dcc696..a02c8a59cd3 100644 --- a/flavors/documentation/Dockerfile +++ b/flavors/documentation/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -231,6 +231,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -256,6 +260,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/dotnet/Dockerfile b/flavors/dotnet/Dockerfile index 7ddd426a5f3..dd21ce2360b 100644 --- a/flavors/dotnet/Dockerfile +++ b/flavors/dotnet/Dockerfile @@ -79,7 +79,7 @@ RUN apk add --no-cache \ lttng-ust-dev \ zlib \ zlib-dev \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -262,6 +262,10 @@ RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/po ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet" +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # POWERSHELL installation # Next line commented because already managed by another linter # RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-linux-musl-x64.tar.gz -o /tmp/powershell.tar.gz \ @@ -319,6 +323,12 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \ # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/dotnetweb/Dockerfile b/flavors/dotnetweb/Dockerfile index 76d71fa6d06..7d095a85d71 100644 --- a/flavors/dotnetweb/Dockerfile +++ b/flavors/dotnetweb/Dockerfile @@ -79,7 +79,7 @@ RUN apk add --no-cache \ lttng-ust-dev \ zlib \ zlib-dev \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -282,6 +282,10 @@ RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/po ENV PATH="${PATH}:/root/.dotnet/tools:/usr/share/dotnet" +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # POWERSHELL installation # Next line commented because already managed by another linter # RUN curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.4.0/powershell-7.4.0-linux-musl-x64.tar.gz -o /tmp/powershell.tar.gz \ @@ -339,6 +343,12 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \ # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/go/Dockerfile b/flavors/go/Dockerfile index 4e93283f6af..a86e57d2713 100644 --- a/flavors/go/Dockerfile +++ b/flavors/go/Dockerfile @@ -71,7 +71,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -239,6 +239,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -271,6 +275,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # revive installation # Managed with COPY --link --from=revive /usr/bin/revive /usr/bin/revive +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/java/Dockerfile b/flavors/java/Dockerfile index e9efb167d4d..cbec6a6bffb 100644 --- a/flavors/java/Dockerfile +++ b/flavors/java/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -275,9 +275,15 @@ RUN ALPINE_GLIBC_BASE_URL="https://github.com/sgerrand/alpine-pkg-glibc/releases # JAVA installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" +# KOTLIN installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -313,6 +319,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # checkstyle installation RUN --mount=type=secret,id=GITHUB_TOKEN CHECKSTYLE_LATEST=$(curl -s \ -H "Accept: application/vnd.github+json" \ diff --git a/flavors/javascript/Dockerfile b/flavors/javascript/Dockerfile index 84992c7678a..6e9c312c775 100644 --- a/flavors/javascript/Dockerfile +++ b/flavors/javascript/Dockerfile @@ -64,7 +64,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -251,6 +251,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -276,6 +280,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/php/Dockerfile b/flavors/php/Dockerfile index 14481e31c9d..4d17d709282 100644 --- a/flavors/php/Dockerfile +++ b/flavors/php/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ gnupg \ php81 \ php81-phar \ @@ -242,6 +242,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # PHP installation RUN --mount=type=secret,id=GITHUB_TOKEN GITHUB_AUTH_TOKEN="$(cat /run/secrets/GITHUB_TOKEN)" \ && export GITHUB_AUTH_TOKEN \ @@ -284,6 +288,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/python/Dockerfile b/flavors/python/Dockerfile index ec923cc17e5..ca48e17e366 100644 --- a/flavors/python/Dockerfile +++ b/flavors/python/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -242,6 +242,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -267,6 +271,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/ruby/Dockerfile b/flavors/ruby/Dockerfile index e00f6cfcc92..440013e912f 100644 --- a/flavors/ruby/Dockerfile +++ b/flavors/ruby/Dockerfile @@ -64,7 +64,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -235,6 +235,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -260,6 +264,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/rust/Dockerfile b/flavors/rust/Dockerfile index ea1232a0641..e2b23e1223b 100644 --- a/flavors/rust/Dockerfile +++ b/flavors/rust/Dockerfile @@ -64,7 +64,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -229,6 +229,10 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -254,6 +258,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/salesforce/Dockerfile b/flavors/salesforce/Dockerfile index c50431d70d9..e88163004ae 100644 --- a/flavors/salesforce/Dockerfile +++ b/flavors/salesforce/Dockerfile @@ -64,7 +64,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -232,9 +232,15 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START -# SALESFORCE installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" + +# SALESFORCE installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ && echo y|sfdx plugins:install sfdx-hardis \ && npm cache clean --force || true \ @@ -265,6 +271,12 @@ RUN sf plugins install @salesforce/plugin-packaging \ # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/swift/Dockerfile b/flavors/swift/Dockerfile index f89d5a25682..69fb6f3e1ea 100644 --- a/flavors/swift/Dockerfile +++ b/flavors/swift/Dockerfile @@ -66,7 +66,7 @@ RUN apk add --no-cache \ openssl \ docker \ openrc \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -231,14 +231,18 @@ COPY --link --from=lychee /usr/local/bin/lychee /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START -RUN rc-update add docker boot && rc-service docker start || true \ +RUN rc-update add docker boot && rc-service docker start || true +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint # Managed with COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck # bash-exec installation - && printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: File:[$1] is not executable"; exit 1; fi' > /usr/bin/bash-exec \ +RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: File:[$1] is not executable"; exit 1; fi' > /usr/bin/bash-exec \ && chmod +x /usr/bin/bash-exec \ # shellcheck installation @@ -257,6 +261,12 @@ RUN rc-update add docker boot && rc-service docker start || true \ # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/flavors/terraform/Dockerfile b/flavors/terraform/Dockerfile index b583a509fd6..59efd239ff2 100644 --- a/flavors/terraform/Dockerfile +++ b/flavors/terraform/Dockerfile @@ -70,7 +70,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ py3-pyflakes \ nodejs \ npm \ @@ -241,6 +241,10 @@ COPY --link --from=terragrunt /bin/terraform /usr/bin/ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # actionlint installation # Managed with COPY --link --from=actionlint /usr/local/bin/actionlint /usr/bin/actionlint # # shellcheck is a dependency for actionlint @@ -266,6 +270,12 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil # dotenv-linter installation && wget -q -O - https://raw.githubusercontent.com/dotenv-linter/dotenv-linter/master/install.sh | sh -s \ +# npm-groovy-lint installation +# Next line commented because already managed by another linter +# ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +# Next line commented because already managed by another linter +# ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation && curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/linters/groovy_npm_groovy_lint/Dockerfile b/linters/groovy_npm_groovy_lint/Dockerfile index 682d9202d14..1f1a7896ff9 100644 --- a/linters/groovy_npm_groovy_lint/Dockerfile +++ b/linters/groovy_npm_groovy_lint/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ npm \ nodejs-current \ yarn \ @@ -145,6 +145,9 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# npm-groovy-lint installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" #OTHER__END diff --git a/linters/java_checkstyle/Dockerfile b/linters/java_checkstyle/Dockerfile index b3c4615cfd4..dcac861173c 100644 --- a/linters/java_checkstyle/Dockerfile +++ b/linters/java_checkstyle/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ && git config --global core.autocrlf true #APK__END @@ -124,7 +124,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # JAVA installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" # checkstyle installation diff --git a/linters/java_pmd/Dockerfile b/linters/java_pmd/Dockerfile index ca694287b01..bc757187f32 100644 --- a/linters/java_pmd/Dockerfile +++ b/linters/java_pmd/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ && git config --global core.autocrlf true #APK__END @@ -124,7 +124,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # JAVA installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" # pmd installation diff --git a/linters/kotlin_ktlint/Dockerfile b/linters/kotlin_ktlint/Dockerfile index d393bb95fc2..7d246563ed6 100644 --- a/linters/kotlin_ktlint/Dockerfile +++ b/linters/kotlin_ktlint/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ && git config --global core.autocrlf true #APK__END @@ -123,6 +123,10 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ## @generated by .automation/build.py using descriptor files, please do not update manually ## ############################################################################################# #OTHER__START +# KOTLIN installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" + # ktlint installation RUN curl --retry 5 --retry-delay 5 -sSLO https://github.com/pinterest/ktlint/releases/latest/download/ktlint && \ chmod a+x ktlint && \ diff --git a/linters/salesforce_lightning_flow_scanner/Dockerfile b/linters/salesforce_lightning_flow_scanner/Dockerfile index 8a1302f837d..1f256e5ef56 100644 --- a/linters/salesforce_lightning_flow_scanner/Dockerfile +++ b/linters/salesforce_lightning_flow_scanner/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ npm \ nodejs-current \ yarn \ @@ -146,7 +146,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # SALESFORCE installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ && echo y|sfdx plugins:install sfdx-hardis \ diff --git a/linters/salesforce_sfdx_scanner_apex/Dockerfile b/linters/salesforce_sfdx_scanner_apex/Dockerfile index 83b4de55e3d..61d774d9a15 100644 --- a/linters/salesforce_sfdx_scanner_apex/Dockerfile +++ b/linters/salesforce_sfdx_scanner_apex/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ npm \ nodejs-current \ yarn \ @@ -146,7 +146,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # SALESFORCE installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ && echo y|sfdx plugins:install sfdx-hardis \ diff --git a/linters/salesforce_sfdx_scanner_aura/Dockerfile b/linters/salesforce_sfdx_scanner_aura/Dockerfile index d791b1d042e..3bbe83fd0b8 100644 --- a/linters/salesforce_sfdx_scanner_aura/Dockerfile +++ b/linters/salesforce_sfdx_scanner_aura/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ npm \ nodejs-current \ yarn \ @@ -146,7 +146,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # SALESFORCE installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ && echo y|sfdx plugins:install sfdx-hardis \ diff --git a/linters/salesforce_sfdx_scanner_lwc/Dockerfile b/linters/salesforce_sfdx_scanner_lwc/Dockerfile index 9dd0188e5d5..56b31267291 100644 --- a/linters/salesforce_sfdx_scanner_lwc/Dockerfile +++ b/linters/salesforce_sfdx_scanner_lwc/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ npm \ nodejs-current \ yarn \ @@ -146,7 +146,7 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # SALESFORCE installation -ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk ENV PATH="$JAVA_HOME/bin:${PATH}" RUN sf plugins install @salesforce/plugin-packaging \ && echo y|sfdx plugins:install sfdx-hardis \ diff --git a/linters/scala_scalafix/Dockerfile b/linters/scala_scalafix/Dockerfile index decc57b6a08..f704a8f08e7 100644 --- a/linters/scala_scalafix/Dockerfile +++ b/linters/scala_scalafix/Dockerfile @@ -49,7 +49,7 @@ RUN apk add --no-cache \ musl-dev \ openssh \ openssl \ - openjdk11 \ + openjdk17 \ && git config --global core.autocrlf true #APK__END @@ -124,6 +124,8 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \ ############################################################################################# #OTHER__START # SCALA installation +ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk +ENV PATH="$JAVA_HOME/bin:${PATH}" RUN curl --retry-all-errors --retry 10 -fLo coursier https://git.io/coursier-cli && \ chmod +x coursier \ diff --git a/megalinter/descriptors/groovy.megalinter-descriptor.yml b/megalinter/descriptors/groovy.megalinter-descriptor.yml index 98d01c8a720..4cb221d8bf9 100644 --- a/megalinter/descriptors/groovy.megalinter-descriptor.yml +++ b/megalinter/descriptors/groovy.megalinter-descriptor.yml @@ -38,7 +38,10 @@ linters: - "npm-groovy-lint -c .groovylintrc.json --fix myfile.groovy myfile2.groovy" install: apk: - - openjdk11 + - openjdk17 + dockerfile: + - ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk + - ENV PATH="$JAVA_HOME/bin:${PATH}" npm: - npm-groovy-lint ide: diff --git a/megalinter/descriptors/java.megalinter-descriptor.yml b/megalinter/descriptors/java.megalinter-descriptor.yml index c4a502c25d4..8e10d15695b 100644 --- a/megalinter/descriptors/java.megalinter-descriptor.yml +++ b/megalinter/descriptors/java.megalinter-descriptor.yml @@ -7,9 +7,9 @@ file_extensions: - ".java" install: apk: - - openjdk11 + - openjdk17 dockerfile: - - ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk + - ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk - ENV PATH="$JAVA_HOME/bin:${PATH}" linters: # Java Checkstyle diff --git a/megalinter/descriptors/kotlin.megalinter-descriptor.yml b/megalinter/descriptors/kotlin.megalinter-descriptor.yml index b6d71531218..69792011a5e 100644 --- a/megalinter/descriptors/kotlin.megalinter-descriptor.yml +++ b/megalinter/descriptors/kotlin.megalinter-descriptor.yml @@ -8,7 +8,10 @@ file_extensions: - ".kts" install: apk: - - openjdk11 + - openjdk17 + dockerfile: + - ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk + - ENV PATH="$JAVA_HOME/bin:${PATH}" linters: # KTLINT - linter_name: ktlint diff --git a/megalinter/descriptors/salesforce.megalinter-descriptor.yml b/megalinter/descriptors/salesforce.megalinter-descriptor.yml index 26cb2890363..3271ba20591 100644 --- a/megalinter/descriptors/salesforce.megalinter-descriptor.yml +++ b/megalinter/descriptors/salesforce.megalinter-descriptor.yml @@ -6,9 +6,9 @@ lint_all_files: true install: # Java, because Apex is Java-based, so are related tools like PMD which is embedded in sfdx-scanner apk: - - openjdk11 + - openjdk17 dockerfile: - - ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk + - ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk - ENV PATH="$JAVA_HOME/bin:${PATH}" - | RUN sf plugins install @salesforce/plugin-packaging \ diff --git a/megalinter/descriptors/scala.megalinter-descriptor.yml b/megalinter/descriptors/scala.megalinter-descriptor.yml index bda7eb6f57d..4a92a9937a7 100644 --- a/megalinter/descriptors/scala.megalinter-descriptor.yml +++ b/megalinter/descriptors/scala.megalinter-descriptor.yml @@ -4,8 +4,10 @@ file_extensions: - ".scala" install: apk: - - openjdk11 + - openjdk17 dockerfile: + - ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk + - ENV PATH="$JAVA_HOME/bin:${PATH}" - | RUN curl --retry-all-errors --retry 10 -fLo coursier https://git.io/coursier-cli && \ chmod +x coursier