Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update base java apk package to openjdk 17 #3160

Merged
merged 1 commit into from
Nov 26, 2023
Merged

Update base java apk package to openjdk 17 #3160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ RUN apk add --no-cache \
lttng-ust-dev \
zlib \
zlib-dev \
openjdk11 \
openjdk17 \
perl \
perl-dev \
gnupg \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 \
Expand All @@ -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

Expand Down Expand Up @@ -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" \
Expand Down
12 changes: 11 additions & 1 deletion flavors/c_cpp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
py3-pyflakes \
clang16-extra-tools \
nodejs \
Expand Down Expand Up @@ -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
Expand All @@ -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 && \
Expand Down
10 changes: 7 additions & 3 deletions flavors/ci_light/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN apk add --no-cache \
nodejs \
npm \
yarn \
openjdk11 \
openjdk17 \
libc-dev \
libxml2-dev \
libxml2-utils \
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
16 changes: 14 additions & 2 deletions flavors/cupcake/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ RUN apk add --no-cache \
openssl \
docker \
openrc \
openjdk11 \
openjdk17 \
gnupg \
php81 \
php81-phar \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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" \
Expand Down
12 changes: 11 additions & 1 deletion flavors/documentation/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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
Expand All @@ -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 && \
Expand Down
12 changes: 11 additions & 1 deletion flavors/dotnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ RUN apk add --no-cache \
lttng-ust-dev \
zlib \
zlib-dev \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
12 changes: 11 additions & 1 deletion flavors/dotnetweb/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ RUN apk add --no-cache \
lttng-ust-dev \
zlib \
zlib-dev \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
12 changes: 11 additions & 1 deletion flavors/go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 && \
Expand Down
16 changes: 14 additions & 2 deletions flavors/java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" \
Expand Down
12 changes: 11 additions & 1 deletion flavors/javascript/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
py3-pyflakes \
nodejs \
npm \
Expand Down Expand Up @@ -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
Expand All @@ -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 && \
Expand Down
12 changes: 11 additions & 1 deletion flavors/php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ RUN apk add --no-cache \
musl-dev \
openssh \
openssl \
openjdk11 \
openjdk17 \
gnupg \
php81 \
php81-phar \
Expand Down Expand Up @@ -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 \
Expand Down Expand Up @@ -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 && \
Expand Down
Loading