You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by dm...@apache.org on 2020/11/30 21:50:47 UTC
[tika-docker] 08/28: Updated Dockerfiles to allow JRE and checking
of signatures to be parameterised
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 73cd4bc04e69e487d0e30624febba0a244ce5c66
Author: David Meikle <dm...@apache.org>
AuthorDate: Thu Feb 6 04:29:43 2020 +0000
Updated Dockerfiles to allow JRE and checking of signatures to be parameterised
---
full/Dockerfile | 12 ++++++++----
minimal/Dockerfile | 10 +++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index 6d63e76..c3ca154 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -13,8 +13,9 @@ FROM ubuntu:bionic as base
RUN apt-get update
FROM base as dependencies
+ARG JRE='openjdk-11-jre-headless'
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless gdal-bin tesseract-ocr \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE gdal-bin tesseract-ocr \
tesseract-ocr-eng tesseract-ocr-ita tesseract-ocr-fra tesseract-ocr-spa tesseract-ocr-deu
RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections \
@@ -22,6 +23,7 @@ RUN echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula selec
FROM dependencies as fetch_tika
ARG TIKA_VERSION
+ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
@@ -29,15 +31,16 @@ ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-ser
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar.asc" \
TIKA_VERSION=$TIKA_VERSION
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& wget -t 10 --max-redirect 1 --retry-connrefused -qO- https://www.apache.org/dist/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || wget $ARCHIVE_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
- && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1;
+
+RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar; fi
FROM dependencies as runtime
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
@@ -49,3 +52,4 @@ EXPOSE 9998
ENTRYPOINT java -jar /tika-server-${TIKA_VERSION}.jar -h 0.0.0.0
LABEL maintainer="Apache Tika Developers dev@tika.apache.org"
+
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index 80da206..11fc925 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -13,10 +13,13 @@ FROM ubuntu:bionic as base
RUN apt-get update
FROM base as dependencies
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless
+ARG JRE='openjdk-11-jre-headless'
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $JRE
FROM dependencies as fetch_tika
ARG TIKA_VERSION
+ARG CHECK_SIG=true
ENV NEAREST_TIKA_SERVER_URL="https://www.apache.org/dyn/closer.cgi/tika/tika-server-${TIKA_VERSION}.jar?filename=tika/tika-server-${TIKA_VERSION}.jar&action=download" \
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/tika-server-${TIKA_VERSION}.jar" \
@@ -31,8 +34,9 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused $DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || wget $ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-${TIKA_VERSION}.jar.asc || rm /tika-server-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1 \
- && gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar
+ && sh -c "[ -f /tika-server-${TIKA_VERSION}.jar.asc ]" || exit 1;
+
+RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify /tika-server-${TIKA_VERSION}.jar.asc /tika-server-${TIKA_VERSION}.jar; fi
FROM dependencies as runtime
RUN apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*