Merge pull request #333 from infosiftr/jdk25
Add JDK 25 variants (the latest LTS)
This commit is contained in:
yosifkit
GitHub
commit
462e723faa
|
|
@ -0,0 +1,158 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 10
|
||||
ENV TOMCAT_VERSION 10.1.46
|
||||
ENV TOMCAT_SHA512 20da89fa77fb8d4dbfccf6c68383751348169542aad9d3cbcaf82011337355b9847b883cc71678fa6cc71ef3f55e8d5d7a09a53238b86011816fa989f9c4ff5e
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-10/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
|
||||
for key in \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'5C3C5F3E314C866292F359A8F3AD5C94A67F707E' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,158 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 10
|
||||
ENV TOMCAT_VERSION 10.1.46
|
||||
ENV TOMCAT_SHA512 20da89fa77fb8d4dbfccf6c68383751348169542aad9d3cbcaf82011337355b9847b883cc71678fa6cc71ef3f55e8d5d7a09a53238b86011816fa989f9c4ff5e
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-10/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-10/KEYS
|
||||
for key in \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'5C3C5F3E314C866292F359A8F3AD5C94A67F707E' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 10
|
||||
ENV TOMCAT_VERSION 10.1.46
|
||||
ENV TOMCAT_SHA512 20da89fa77fb8d4dbfccf6c68383751348169542aad9d3cbcaf82011337355b9847b883cc71678fa6cc71ef3f55e8d5d7a09a53238b86011816fa989f9c4ff5e
|
||||
|
||||
COPY --from=tomcat:10.1.46-jdk25-temurin-jammy $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 10
|
||||
ENV TOMCAT_VERSION 10.1.46
|
||||
ENV TOMCAT_SHA512 20da89fa77fb8d4dbfccf6c68383751348169542aad9d3cbcaf82011337355b9847b883cc71678fa6cc71ef3f55e8d5d7a09a53238b86011816fa989f9c4ff5e
|
||||
|
||||
COPY --from=tomcat:10.1.46-jdk25-temurin-noble $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,158 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 11
|
||||
ENV TOMCAT_VERSION 11.0.11
|
||||
ENV TOMCAT_SHA512 a26b2269530fd2fc834e9b1544962f6524cf87925de43b05ad050e66b5eaa76a4ad754a2c5fc4f851baf75a0ea1b0ed8f51082300393a4c35d8c2da0d7c535bd
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-11/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
|
||||
for key in \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'48F8E69F6390C9F25CFEDCD268248959359E722B' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,158 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 11
|
||||
ENV TOMCAT_VERSION 11.0.11
|
||||
ENV TOMCAT_SHA512 a26b2269530fd2fc834e9b1544962f6524cf87925de43b05ad050e66b5eaa76a4ad754a2c5fc4f851baf75a0ea1b0ed8f51082300393a4c35d8c2da0d7c535bd
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-11/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-11/KEYS
|
||||
for key in \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'48F8E69F6390C9F25CFEDCD268248959359E722B' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 11
|
||||
ENV TOMCAT_VERSION 11.0.11
|
||||
ENV TOMCAT_SHA512 a26b2269530fd2fc834e9b1544962f6524cf87925de43b05ad050e66b5eaa76a4ad754a2c5fc4f851baf75a0ea1b0ed8f51082300393a4c35d8c2da0d7c535bd
|
||||
|
||||
COPY --from=tomcat:11.0.11-jdk25-temurin-jammy $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 11
|
||||
ENV TOMCAT_VERSION 11.0.11
|
||||
ENV TOMCAT_SHA512 a26b2269530fd2fc834e9b1544962f6524cf87925de43b05ad050e66b5eaa76a4ad754a2c5fc4f851baf75a0ea1b0ed8f51082300393a4c35d8c2da0d7c535bd
|
||||
|
||||
COPY --from=tomcat:11.0.11-jdk25-temurin-noble $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,160 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 9
|
||||
ENV TOMCAT_VERSION 9.0.109
|
||||
ENV TOMCAT_SHA512 29341c17d92b8f72700c7e0626405a63f3ba30737019fbe6a25cafbd929c5e14aa99817e1d4990da11593400e8e5977da9f9f7f9c097d95f820783f33a3cf9b7
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-9/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-9/KEYS
|
||||
for key in \
|
||||
'DCFD35E0BF8CA7344752DE8B6FB21E8933C60243' \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'48F8E69F6390C9F25CFEDCD268248959359E722B' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
--with-ssl \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,160 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jdk-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 9
|
||||
ENV TOMCAT_VERSION 9.0.109
|
||||
ENV TOMCAT_SHA512 29341c17d92b8f72700c7e0626405a63f3ba30737019fbe6a25cafbd929c5e14aa99817e1d4990da11593400e8e5977da9f9f7f9c097d95f820783f33a3cf9b7
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
ca-certificates \
|
||||
curl \
|
||||
gnupg \
|
||||
; \
|
||||
\
|
||||
ddist() { \
|
||||
local f="$1"; shift; \
|
||||
local distFile="$1"; shift; \
|
||||
local mvnFile="${1:-}"; \
|
||||
local success=; \
|
||||
local distUrl=; \
|
||||
for distUrl in \
|
||||
# https://apache.org/history/mirror-history.html
|
||||
"https://dlcdn.apache.org/$distFile" \
|
||||
# if the version is outdated, we have to pull from the archive
|
||||
"https://archive.apache.org/dist/$distFile" \
|
||||
# if all else fails, let's try Maven (https://www.mail-archive.com/users@tomcat.apache.org/msg134940.html; https://mvnrepository.com/artifact/org.apache.tomcat/tomcat; https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/)
|
||||
${mvnFile:+"https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/$mvnFile"} \
|
||||
; do \
|
||||
if curl -fL -o "$f" "$distUrl" && [ -s "$f" ]; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
}; \
|
||||
\
|
||||
ddist 'tomcat.tar.gz' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz"; \
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum --strict --check -; \
|
||||
ddist 'tomcat.tar.gz.asc' "tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc" "$TOMCAT_VERSION/tomcat-$TOMCAT_VERSION.tar.gz.asc"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
curl -fL -o upstream-KEYS 'https://www.apache.org/dist/tomcat/tomcat-9/KEYS'; \
|
||||
gpg --batch --import upstream-KEYS; \
|
||||
# filter upstream KEYS file to *just* known/precomputed fingerprints
|
||||
printf '' > filtered-KEYS; \
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-9/KEYS
|
||||
for key in \
|
||||
'DCFD35E0BF8CA7344752DE8B6FB21E8933C60243' \
|
||||
'A9C5DF4D22E99998D9875A5110C01C5A2F6059E7' \
|
||||
'48F8E69F6390C9F25CFEDCD268248959359E722B' \
|
||||
; do \
|
||||
gpg --batch --fingerprint "$key"; \
|
||||
gpg --batch --export --armor "$key" >> filtered-KEYS; \
|
||||
done; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
GNUPGHOME="$(mktemp -d)"; export GNUPGHOME; \
|
||||
gpg --batch --import filtered-KEYS; \
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
gpgconf --kill all; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
# https://tomcat.apache.org/tomcat-9.0-doc/security-howto.html#Default_web_applications
|
||||
mv webapps webapps.dist; \
|
||||
mkdir webapps; \
|
||||
# we don't delete them completely because they're frankly a pain to get back for users who do want them, and they're generally tiny (~7MB)
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
dpkg-dev \
|
||||
gcc \
|
||||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
aprConfig="$(command -v apr-1-config)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$aprConfig" \
|
||||
--with-java-home="$JAVA_HOME" \
|
||||
--with-ssl \
|
||||
; \
|
||||
nproc="$(nproc)"; \
|
||||
make -j "$nproc"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
|
||||
apt-mark auto '.*' > /dev/null; \
|
||||
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; \
|
||||
find "$TOMCAT_NATIVE_LIBDIR" -type f -executable -exec ldd '{}' ';' \
|
||||
| awk '/=>/ { print $(NF-1) }' \
|
||||
| xargs -rt readlink -e \
|
||||
| sort -u \
|
||||
| xargs -rt dpkg-query --search \
|
||||
| cut -d: -f1 \
|
||||
| sort -u \
|
||||
| tee "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt" \
|
||||
| xargs -r apt-mark manual \
|
||||
; \
|
||||
\
|
||||
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
find ./bin/ -name '*.sh' -exec sed -ri 's|^#!/bin/sh$|#!/usr/bin/env bash|' '{}' +; \
|
||||
\
|
||||
# fix permissions (especially for running as non-root)
|
||||
# https://github.com/docker-library/tomcat/issues/35
|
||||
chmod -R +rX .; \
|
||||
chmod 1777 logs temp work; \
|
||||
\
|
||||
# smoke test
|
||||
catalina.sh version
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-jammy
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 9
|
||||
ENV TOMCAT_VERSION 9.0.109
|
||||
ENV TOMCAT_SHA512 29341c17d92b8f72700c7e0626405a63f3ba30737019fbe6a25cafbd929c5e14aa99817e1d4990da11593400e8e5977da9f9f7f9c097d95f820783f33a3cf9b7
|
||||
|
||||
COPY --from=tomcat:9.0.109-jdk25-temurin-jammy $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM eclipse-temurin:25-jre-noble
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
RUN mkdir -p "$CATALINA_HOME"
|
||||
WORKDIR $CATALINA_HOME
|
||||
|
||||
# let "Tomcat Native" live somewhere isolated
|
||||
ENV TOMCAT_NATIVE_LIBDIR $CATALINA_HOME/native-jni-lib
|
||||
ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
||||
|
||||
ENV TOMCAT_MAJOR 9
|
||||
ENV TOMCAT_VERSION 9.0.109
|
||||
ENV TOMCAT_SHA512 29341c17d92b8f72700c7e0626405a63f3ba30737019fbe6a25cafbd929c5e14aa99817e1d4990da11593400e8e5977da9f9f7f9c097d95f820783f33a3cf9b7
|
||||
|
||||
COPY --from=tomcat:9.0.109-jdk25-temurin-noble $CATALINA_HOME $CATALINA_HOME
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
xargs -rt apt-get install -y --no-install-recommends < "$TOMCAT_NATIVE_LIBDIR/.dependencies.txt"; \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -eux; \
|
||||
nativeLines="$(catalina.sh configtest 2>&1)"; \
|
||||
nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')"; \
|
||||
nativeLines="$(echo "$nativeLines" | sort -u)"; \
|
||||
if ! echo "$nativeLines" | grep -E 'INFO: Loaded( APR based)? Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
|
||||
# upstream eclipse-temurin-provided entrypoint script caused https://github.com/docker-library/tomcat/issues/77 to come back as https://github.com/docker-library/tomcat/issues/302; use "/entrypoint.sh" at your own risk
|
||||
ENTRYPOINT []
|
||||
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -2,6 +2,10 @@
|
|||
"10.1": {
|
||||
"sha512": "20da89fa77fb8d4dbfccf6c68383751348169542aad9d3cbcaf82011337355b9847b883cc71678fa6cc71ef3f55e8d5d7a09a53238b86011816fa989f9c4ff5e",
|
||||
"variants": [
|
||||
"jdk25/temurin-noble",
|
||||
"jre25/temurin-noble",
|
||||
"jdk25/temurin-jammy",
|
||||
"jre25/temurin-jammy",
|
||||
"jdk21/temurin-noble",
|
||||
"jre21/temurin-noble",
|
||||
"jdk21/temurin-jammy",
|
||||
|
|
@ -20,6 +24,10 @@
|
|||
"11.0": {
|
||||
"sha512": "a26b2269530fd2fc834e9b1544962f6524cf87925de43b05ad050e66b5eaa76a4ad754a2c5fc4f851baf75a0ea1b0ed8f51082300393a4c35d8c2da0d7c535bd",
|
||||
"variants": [
|
||||
"jdk25/temurin-noble",
|
||||
"jre25/temurin-noble",
|
||||
"jdk25/temurin-jammy",
|
||||
"jre25/temurin-jammy",
|
||||
"jdk21/temurin-noble",
|
||||
"jre21/temurin-noble",
|
||||
"jdk21/temurin-jammy",
|
||||
|
|
@ -34,6 +42,10 @@
|
|||
"9.0": {
|
||||
"sha512": "29341c17d92b8f72700c7e0626405a63f3ba30737019fbe6a25cafbd929c5e14aa99817e1d4990da11593400e8e5977da9f9f7f9c097d95f820783f33a3cf9b7",
|
||||
"variants": [
|
||||
"jdk25/temurin-noble",
|
||||
"jre25/temurin-noble",
|
||||
"jdk25/temurin-jammy",
|
||||
"jre25/temurin-jammy",
|
||||
"jdk21/temurin-noble",
|
||||
"jre21/temurin-noble",
|
||||
"jdk21/temurin-jammy",
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ _bashbrew_list() {
|
|||
}
|
||||
|
||||
allVariants='[]'
|
||||
for javaVersion in 21 17 11 8; do
|
||||
for javaVersion in 25 21 17 11 8; do
|
||||
# Eclipse Temurin, followed by OpenJDK, and then all other variants alphabetically
|
||||
for vendorVariant in \
|
||||
temurin-{noble,jammy} \
|
||||
|
|
|
|||
Loading…
Reference in New Issue