Update for updated OpenJDK base images
This commit is contained in:
Tianon Gravi
parent
8ddcad31ad
commit
7eae995786
26
.travis.yml
26
.travis.yml
|
|
@ -2,22 +2,16 @@ language: bash
|
|||
services: docker
|
||||
|
||||
env:
|
||||
- VERSION=9.0 VARIANT=jre8-slim
|
||||
- VERSION=9.0 VARIANT=jre8-alpine
|
||||
- VERSION=9.0 VARIANT=jre8
|
||||
- VERSION=9.0 VARIANT=jre11-slim
|
||||
- VERSION=9.0 VARIANT=jre11
|
||||
- VERSION=8.5 VARIANT=jre8-slim
|
||||
- VERSION=8.5 VARIANT=jre8-alpine
|
||||
- VERSION=8.5 VARIANT=jre8
|
||||
- VERSION=8.5 VARIANT=jre11-slim
|
||||
- VERSION=8.5 VARIANT=jre11
|
||||
- VERSION=7 VARIANT=jre8-slim
|
||||
- VERSION=7 VARIANT=jre8-alpine
|
||||
- VERSION=7 VARIANT=jre8
|
||||
- VERSION=7 VARIANT=jre7-slim
|
||||
- VERSION=7 VARIANT=jre7-alpine
|
||||
- VERSION=7 VARIANT=jre7
|
||||
- VERSION=9.0 VARIANT=jdk8-slim
|
||||
- VERSION=9.0 VARIANT=jdk8
|
||||
- VERSION=9.0 VARIANT=jdk11-slim
|
||||
- VERSION=9.0 VARIANT=jdk11
|
||||
- VERSION=8.5 VARIANT=jdk8-slim
|
||||
- VERSION=8.5 VARIANT=jdk8
|
||||
- VERSION=8.5 VARIANT=jdk11-slim
|
||||
- VERSION=8.5 VARIANT=jdk11
|
||||
- VERSION=7 VARIANT=jdk8-slim
|
||||
- VERSION=7 VARIANT=jdk8
|
||||
|
||||
install:
|
||||
- git clone https://github.com/docker-library/official-images.git ~/official-images
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:7-jre-slim
|
||||
FROM openjdk:8-jdk-slim
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:8-jre-slim
|
||||
FROM openjdk:8-jdk
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
FROM openjdk:7-jre-alpine
|
||||
|
||||
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
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 7
|
||||
ENV TOMCAT_VERSION 7.0.94
|
||||
ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps \
|
||||
gnupg \
|
||||
\
|
||||
ca-certificates \
|
||||
openssl \
|
||||
; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apk add --no-cache --virtual .native-build-deps \
|
||||
apr-dev \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
gcc \
|
||||
libc-dev \
|
||||
make \
|
||||
"openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \
|
||||
openssl-dev \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
make -j "$(nproc)"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --virtual .tomcat-native-rundeps $runDeps; \
|
||||
apk del .fetch-deps .native-build-deps; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
apk add --no-cache bash; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
FROM openjdk:7-jre
|
||||
|
||||
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
|
||||
|
||||
# runtime dependencies for Tomcat Native Libraries
|
||||
# Tomcat Native 1.2+ requires a newer version of OpenSSL than debian:jessie has available
|
||||
# > checking OpenSSL library version >= 1.0.2...
|
||||
# > configure: error: Your version of OpenSSL is not compatible with this version of tcnative
|
||||
# see http://tomcat.10.x6.nabble.com/VOTE-Release-Apache-Tomcat-8-0-32-tp5046007p5046024.html (and following discussion)
|
||||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
# only add stretch if we're not already building from within stretch
|
||||
{ \
|
||||
echo 'deb http://deb.debian.org/debian stretch main'; \
|
||||
echo 'deb http://security.debian.org stretch/updates main'; \
|
||||
echo 'deb http://deb.debian.org/debian stretch-updates main'; \
|
||||
} > /etc/apt/sources.list.d/stretch.list; \
|
||||
{ \
|
||||
# add a negative "Pin-Priority" so that we never ever get packages from stretch unless we explicitly request them
|
||||
echo 'Package: *'; \
|
||||
echo 'Pin: release n=stretch*'; \
|
||||
echo 'Pin-Priority: -10'; \
|
||||
echo; \
|
||||
# ... except OpenSSL, which is the reason we're here
|
||||
echo 'Package: openssl libssl*'; \
|
||||
echo "Pin: version $OPENSSL_VERSION"; \
|
||||
echo 'Pin-Priority: 990'; \
|
||||
} > /etc/apt/preferences.d/stretch-openssl; \
|
||||
fi; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl="$OPENSSL_VERSION"; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libapr1 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 7
|
||||
ENV TOMCAT_VERSION 7.0.94
|
||||
ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
\
|
||||
apt-get install -y --no-install-recommends gnupg dirmngr; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
apt-get install -y --no-install-recommends wget ca-certificates; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf 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 \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
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; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
FROM openjdk:8-jre-alpine
|
||||
|
||||
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
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 7
|
||||
ENV TOMCAT_VERSION 7.0.94
|
||||
ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps \
|
||||
gnupg \
|
||||
\
|
||||
ca-certificates \
|
||||
openssl \
|
||||
; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apk add --no-cache --virtual .native-build-deps \
|
||||
apr-dev \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
gcc \
|
||||
libc-dev \
|
||||
make \
|
||||
"openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \
|
||||
openssl-dev \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
make -j "$(nproc)"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --virtual .tomcat-native-rundeps $runDeps; \
|
||||
apk del .fetch-deps .native-build-deps; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
apk add --no-cache bash; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,167 +0,0 @@
|
|||
FROM openjdk:8-jre
|
||||
|
||||
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
|
||||
|
||||
# runtime dependencies for Tomcat Native Libraries
|
||||
# Tomcat Native 1.2+ requires a newer version of OpenSSL than debian:jessie has available
|
||||
# > checking OpenSSL library version >= 1.0.2...
|
||||
# > configure: error: Your version of OpenSSL is not compatible with this version of tcnative
|
||||
# see http://tomcat.10.x6.nabble.com/VOTE-Release-Apache-Tomcat-8-0-32-tp5046007p5046024.html (and following discussion)
|
||||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
# only add stretch if we're not already building from within stretch
|
||||
{ \
|
||||
echo 'deb http://deb.debian.org/debian stretch main'; \
|
||||
echo 'deb http://security.debian.org stretch/updates main'; \
|
||||
echo 'deb http://deb.debian.org/debian stretch-updates main'; \
|
||||
} > /etc/apt/sources.list.d/stretch.list; \
|
||||
{ \
|
||||
# add a negative "Pin-Priority" so that we never ever get packages from stretch unless we explicitly request them
|
||||
echo 'Package: *'; \
|
||||
echo 'Pin: release n=stretch*'; \
|
||||
echo 'Pin-Priority: -10'; \
|
||||
echo; \
|
||||
# ... except OpenSSL, which is the reason we're here
|
||||
echo 'Package: openssl libssl*'; \
|
||||
echo "Pin: version $OPENSSL_VERSION"; \
|
||||
echo 'Pin-Priority: 990'; \
|
||||
} > /etc/apt/preferences.d/stretch-openssl; \
|
||||
fi; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl="$OPENSSL_VERSION"; \
|
||||
rm -rf /var/lib/apt/lists/*; \
|
||||
fi
|
||||
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
libapr1 \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 7
|
||||
ENV TOMCAT_VERSION 7.0.94
|
||||
ENV TOMCAT_SHA512 b16f4b08591199e15f953c34965389a80d5597c28626a51c71ce42695ddd3359dc4df7f333ef0e1a1e8f9b2b6245041d57607c46764f33e560246c119cdc0f7a
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
savedAptMark="$(apt-mark showmanual)"; \
|
||||
apt-get update; \
|
||||
\
|
||||
apt-get install -y --no-install-recommends gnupg dirmngr; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
apt-get install -y --no-install-recommends wget ca-certificates; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf 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 \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
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; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:8-jre
|
||||
FROM openjdk:11-jdk-slim
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:11-jre
|
||||
FROM openjdk:11-jdk
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:8-jre-slim
|
||||
FROM openjdk:8-jdk-slim
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:11-jre-slim
|
||||
FROM openjdk:8-jdk
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
FROM openjdk:8-jre-alpine
|
||||
|
||||
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
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 713DA88BE50911535FE716F5208B0AB1D63011C7 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 8
|
||||
ENV TOMCAT_VERSION 8.5.41
|
||||
ENV TOMCAT_SHA512 16c86acb5ef635cdb260609e6d3630b87f963c9f71c35d97a0b413669509cb7258931f9d9f8d90f18665d936b491e4ea84ea8f4d71b336a208f353a268f70964
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps \
|
||||
gnupg \
|
||||
\
|
||||
ca-certificates \
|
||||
openssl \
|
||||
; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apk add --no-cache --virtual .native-build-deps \
|
||||
apr-dev \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
gcc \
|
||||
libc-dev \
|
||||
make \
|
||||
"openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \
|
||||
openssl-dev \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
make -j "$(nproc)"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --virtual .tomcat-native-rundeps $runDeps; \
|
||||
apk del .fetch-deps .native-build-deps; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
apk add --no-cache bash; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:8-jre
|
||||
FROM openjdk:11-jdk-slim
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:11-jre
|
||||
FROM openjdk:11-jdk
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:8-jre-slim
|
||||
FROM openjdk:8-jdk-slim
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
FROM openjdk:11-jre-slim
|
||||
FROM openjdk:8-jdk
|
||||
|
||||
ENV CATALINA_HOME /usr/local/tomcat
|
||||
ENV PATH $CATALINA_HOME/bin:$PATH
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION 1.1.0j-1~deb9u1
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
FROM openjdk:8-jre-alpine
|
||||
|
||||
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
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS 05AB33110949707C93A279E3D3EFE6B686867BA6 07E48665A34DCAFAE522E5E6266191C37C037D42 47309207D818FFD8DCD3F83F1931D684307A10A5 541FBE7D8F78B25E055DDEE13C370389288584E7 61B832AC2F1C5A90F0F9B00A1C506407564C17A3 79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED 9BA44C2621385CB966EBA586F72C284D731FABEE A27677289986DB50844682F8ACB77FC2E86E29AC A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23
|
||||
|
||||
ENV TOMCAT_MAJOR 9
|
||||
ENV TOMCAT_VERSION 9.0.20
|
||||
ENV TOMCAT_SHA512 6d2df51f0bfc6a90cfca61c86473b8843da4162c430ab06b8f66f364931f3d8a3ad399703acdd600ff4f633d7d6725edf05d5d5d19534716a2f3f9f5238a32a0
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps \
|
||||
gnupg \
|
||||
\
|
||||
ca-certificates \
|
||||
openssl \
|
||||
; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apk add --no-cache --virtual .native-build-deps \
|
||||
apr-dev \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
gcc \
|
||||
libc-dev \
|
||||
make \
|
||||
"openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \
|
||||
openssl-dev \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
make -j "$(nproc)"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --virtual .tomcat-native-rundeps $runDeps; \
|
||||
apk del .fetch-deps .native-build-deps; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
apk add --no-cache bash; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -1,135 +0,0 @@
|
|||
FROM PLACEHOLDER
|
||||
|
||||
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
|
||||
|
||||
# see https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/KEYS
|
||||
# see also "update.sh" (https://github.com/docker-library/tomcat/blob/master/update.sh)
|
||||
ENV GPG_KEYS placeholder
|
||||
|
||||
ENV TOMCAT_MAJOR placeholder
|
||||
ENV TOMCAT_VERSION placeholder
|
||||
ENV TOMCAT_SHA512 placeholder
|
||||
|
||||
ENV TOMCAT_TGZ_URLS \
|
||||
# https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
# if the version is outdated, we might have to pull from the dist/archive :/
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz
|
||||
|
||||
ENV TOMCAT_ASC_URLS \
|
||||
https://www.apache.org/dyn/closer.cgi?action=download&filename=tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
# not all the mirrors actually carry the .asc files :'(
|
||||
https://www-us.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc \
|
||||
https://archive.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz.asc
|
||||
|
||||
RUN set -eux; \
|
||||
\
|
||||
apk add --no-cache --virtual .fetch-deps \
|
||||
gnupg \
|
||||
\
|
||||
ca-certificates \
|
||||
openssl \
|
||||
; \
|
||||
\
|
||||
export GNUPGHOME="$(mktemp -d)"; \
|
||||
for key in $GPG_KEYS; do \
|
||||
gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
|
||||
done; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_TGZ_URLS; do \
|
||||
if wget -O tomcat.tar.gz "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
echo "$TOMCAT_SHA512 *tomcat.tar.gz" | sha512sum -c -; \
|
||||
\
|
||||
success=; \
|
||||
for url in $TOMCAT_ASC_URLS; do \
|
||||
if wget -O tomcat.tar.gz.asc "$url"; then \
|
||||
success=1; \
|
||||
break; \
|
||||
fi; \
|
||||
done; \
|
||||
[ -n "$success" ]; \
|
||||
\
|
||||
gpg --batch --verify tomcat.tar.gz.asc tomcat.tar.gz; \
|
||||
tar -xvf tomcat.tar.gz --strip-components=1; \
|
||||
rm bin/*.bat; \
|
||||
rm tomcat.tar.gz*; \
|
||||
command -v gpgconf && gpgconf --kill all || :; \
|
||||
rm -rf "$GNUPGHOME"; \
|
||||
\
|
||||
nativeBuildDir="$(mktemp -d)"; \
|
||||
tar -xvf bin/tomcat-native.tar.gz -C "$nativeBuildDir" --strip-components=1; \
|
||||
apk add --no-cache --virtual .native-build-deps \
|
||||
apr-dev \
|
||||
coreutils \
|
||||
dpkg-dev dpkg \
|
||||
gcc \
|
||||
libc-dev \
|
||||
make \
|
||||
"openjdk${JAVA_VERSION%%[-~bu]*}"="$JAVA_ALPINE_VERSION" \
|
||||
openssl-dev \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
cd "$nativeBuildDir/native"; \
|
||||
gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
|
||||
./configure \
|
||||
--build="$gnuArch" \
|
||||
--libdir="$TOMCAT_NATIVE_LIBDIR" \
|
||||
--prefix="$CATALINA_HOME" \
|
||||
--with-apr="$(which apr-1-config)" \
|
||||
--with-java-home="$(docker-java-home)" \
|
||||
--with-ssl=yes; \
|
||||
make -j "$(nproc)"; \
|
||||
make install; \
|
||||
); \
|
||||
rm -rf "$nativeBuildDir"; \
|
||||
rm bin/tomcat-native.tar.gz; \
|
||||
\
|
||||
runDeps="$( \
|
||||
scanelf --needed --nobanner --format '%n#p' --recursive "$TOMCAT_NATIVE_LIBDIR" \
|
||||
| tr ',' '\n' \
|
||||
| sort -u \
|
||||
| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
|
||||
)"; \
|
||||
apk add --virtual .tomcat-native-rundeps $runDeps; \
|
||||
apk del .fetch-deps .native-build-deps; \
|
||||
\
|
||||
# sh removes env vars it doesn't support (ones with periods)
|
||||
# https://github.com/docker-library/tomcat/issues/77
|
||||
apk add --no-cache bash; \
|
||||
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 777 logs work
|
||||
|
||||
# verify Tomcat Native is working properly
|
||||
RUN set -e \
|
||||
&& nativeLines="$(catalina.sh configtest 2>&1)" \
|
||||
&& nativeLines="$(echo "$nativeLines" | grep 'Apache Tomcat Native')" \
|
||||
&& nativeLines="$(echo "$nativeLines" | sort -u)" \
|
||||
&& if ! echo "$nativeLines" | grep 'INFO: Loaded APR based Apache Tomcat Native library' >&2; then \
|
||||
echo >&2 "$nativeLines"; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
EXPOSE 8080
|
||||
CMD ["catalina.sh", "run"]
|
||||
|
|
@ -17,6 +17,8 @@ ENV LD_LIBRARY_PATH ${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$TOMCAT_NATIVE_LIBDIR
|
|||
# and https://github.com/docker-library/tomcat/pull/31
|
||||
ENV OPENSSL_VERSION placeholder
|
||||
RUN set -ex; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends openssl; \
|
||||
currentVersion="$(dpkg-query --show --showformat '${Version}\n' openssl)"; \
|
||||
if dpkg --compare-versions "$currentVersion" '<<' "$OPENSSL_VERSION"; then \
|
||||
if ! grep -q stretch /etc/apt/sources.list; then \
|
||||
|
|
@ -119,7 +121,6 @@ RUN set -eux; \
|
|||
libapr1-dev \
|
||||
libssl-dev \
|
||||
make \
|
||||
"openjdk-${JAVA_VERSION%%[.~bu-]*}-jdk=$JAVA_DEBIAN_VERSION" \
|
||||
; \
|
||||
( \
|
||||
export CATALINA_HOME="$PWD"; \
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
set -eu
|
||||
|
||||
declare -A latestVariant=(
|
||||
[7]='jre7'
|
||||
[8.0]='jre7'
|
||||
[8.5]='jre8'
|
||||
[9.0]='jre10'
|
||||
[7]='jdk8'
|
||||
[8.0]='jdk8'
|
||||
[8.5]='jdk8'
|
||||
[9.0]='jdk11'
|
||||
)
|
||||
declare -A aliases=(
|
||||
[8.5]='8 latest'
|
||||
|
|
@ -72,7 +72,7 @@ join() {
|
|||
}
|
||||
|
||||
for version in "${versions[@]}"; do
|
||||
for variant in jre{7,8,9,10,11,12}{,-{slim,alpine}}; do
|
||||
for variant in jdk{8,11,12,13}{,-slim}; do
|
||||
[ -f "$version/$variant/Dockerfile" ] || continue
|
||||
|
||||
commit="$(dirCommit "$version/$variant")"
|
||||
|
|
|
|||
|
|
@ -138,8 +138,8 @@ for version in "${versions[@]}"; do
|
|||
|
||||
baseImage='openjdk'
|
||||
case "$javaVariant" in
|
||||
jre*|jdk*)
|
||||
baseImage+=":${javaVariant:3}-${javaVariant:0:3}${subVariant:+-$subVariant}" # ":7-jre" or ":7-jre-alpine"
|
||||
jdk*)
|
||||
baseImage+=":${javaVariant:3}-${javaVariant:0:3}${subVariant:+-$subVariant}" # ":7-jdk"
|
||||
if [[ "$javaVariant" == *-slim ]]; then
|
||||
baseImage+='-slim'
|
||||
fi
|
||||
|
|
|
|||
Loading…
Reference in New Issue