This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch TIKA-3911
in repository https://gitbox.apache.org/repos/asf/tika-docker.git
commit 5b5a98dbce70c6262405e9e641503fb4c509481c
Author: tallison <talli...@apache.org>
AuthorDate: Fri Oct 28 12:59:26 2022 -0400
TIKA-3911 clean up downloads to pull directly from apaches cdn
---
full/Dockerfile | 12 ++----------
minimal/Dockerfile | 12 ++----------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/full/Dockerfile b/full/Dockerfile
index 44a368e..4ab2d6e 100644
--- a/full/Dockerfile
+++ b/full/Dockerfile
@@ -32,29 +32,21 @@ 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_VERSION}/tika-server-standard-${TIKA_VERSION}.jar?filename=tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar&action=download";
\
-
NEAREST_TIKA_SERVER_URL_OLD="https://www.apache.org/dyn/closer.cgi/tika/tika-server-standard-${TIKA_VERSION}.jar?filename=tika/tika-server-standard-${TIKA_VERSION}.jar&action=download";
\
+ENV
NEAREST_TIKA_SERVER_URL="https://dlcdn.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
-
ARCHIVE_TIKA_SERVER_URL_OLD="https://archive.apache.org/dist/tika/tika-server-standard-${TIKA_VERSION}.jar";
\
-
BACKUP_TIKA_SERVER_URL="https://downloads.apache.org/tika/tika-server-standard-${TIKA_VERSION}.jar";
\
+
BACKUP_TIKA_SERVER_URL="https://downloads.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
DEFAULT_TIKA_SERVER_ASC_URL="https://downloads.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
-
DEFAULT_TIKA_SERVER_ASC_URL_OLD="https://downloads.apache.org/tika/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
-
ARCHIVE_TIKA_SERVER_ASC_URL_OLD="https://archive.apache.org/dist/tika/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
TIKA_VERSION=$TIKA_VERSION
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& wget -t 10 --max-redirect 1 --retry-connrefused -qO-
https://downloads.apache.org/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused
$NEAREST_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$NEAREST_TIKA_SERVER_URL_OLD -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$ARCHIVE_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$ARCHIVE_TIKA_SERVER_URL_OLD -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$BACKUP_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused
$DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-standard-${TIKA_VERSION}.jar.asc
|| rm /tika-server-standard-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$DEFAULT_TIKA_SERVER_ASC_URL_OLD -O
/tika-server-standard-${TIKA_VERSION}.jar.asc || rm
/tika-server-standard-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-standard-${TIKA_VERSION}.jar.asc
|| rm /tika-server-standard-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$ARCHIVE_TIKA_SERVER_ASC_URL_OLD -O
/tika-server-standard-${TIKA_VERSION}.jar.asc || rm
/tika-server-standard-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || exit 1;
RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify
/tika-server-standard-${TIKA_VERSION}.jar.asc
/tika-server-standard-${TIKA_VERSION}.jar; fi
diff --git a/minimal/Dockerfile b/minimal/Dockerfile
index fbe09e8..ad62339 100644
--- a/minimal/Dockerfile
+++ b/minimal/Dockerfile
@@ -25,29 +25,21 @@ 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_VERSION}/tika-server-standard-${TIKA_VERSION}.jar?filename=tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar&action=download";
\
-
NEAREST_TIKA_SERVER_URL_OLD="https://www.apache.org/dyn/closer.cgi/tika/tika-server-standard-${TIKA_VERSION}.jar?filename=tika/tika-server-standard-${TIKA_VERSION}.jar&action=download";
\
+ENV
NEAREST_TIKA_SERVER_URL="https://dlcdn.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
ARCHIVE_TIKA_SERVER_URL="https://archive.apache.org/dist/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
-
ARCHIVE_TIKA_SERVER_URL_OLD="https://archive.apache.org/dist/tika/tika-server-standard-${TIKA_VERSION}.jar";
\
-
BACKUP_TIKA_SERVER_URL="https://downloads.apache.org/tika/tika-server-standard-${TIKA_VERSION}.jar";
\
+
BACKUP_TIKA_SERVER_URL="https://downloads.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar";
\
DEFAULT_TIKA_SERVER_ASC_URL="https://downloads.apache.org/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
-
DEFAULT_TIKA_SERVER_ASC_URL_OLD="https://downloads.apache.org/tika/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
ARCHIVE_TIKA_SERVER_ASC_URL="https://archive.apache.org/dist/tika/${TIKA_VERSION}/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
-
ARCHIVE_TIKA_SERVER_ASC_URL_OLD="https://archive.apache.org/dist/tika/tika-server-standard-${TIKA_VERSION}.jar.asc";
\
TIKA_VERSION=$TIKA_VERSION
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 wget \
&& wget -t 10 --max-redirect 1 --retry-connrefused -qO-
https://downloads.apache.org/tika/KEYS | gpg --import \
&& wget -t 10 --max-redirect 1 --retry-connrefused
$NEAREST_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$NEAREST_TIKA_SERVER_URL_OLD -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$ARCHIVE_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$ARCHIVE_TIKA_SERVER_URL_OLD -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || wget
$BACKUP_TIKA_SERVER_URL -O /tika-server-standard-${TIKA_VERSION}.jar || rm
/tika-server-standard-${TIKA_VERSION}.jar \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar ]" || exit 1 \
&& wget -t 10 --max-redirect 1 --retry-connrefused
$DEFAULT_TIKA_SERVER_ASC_URL -O /tika-server-standard-${TIKA_VERSION}.jar.asc
|| rm /tika-server-standard-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$DEFAULT_TIKA_SERVER_ASC_URL_OLD -O
/tika-server-standard-${TIKA_VERSION}.jar.asc || rm
/tika-server-standard-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$ARCHIVE_TIKA_SERVER_ASC_URL -O /tika-server-standard-${TIKA_VERSION}.jar.asc
|| rm /tika-server-standard-${TIKA_VERSION}.jar.asc \
- && sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || wget
$ARCHIVE_TIKA_SERVER_ASC_URL_OLD -O
/tika-server-standard-${TIKA_VERSION}.jar.asc || rm
/tika-server-standard-${TIKA_VERSION}.jar.asc \
&& sh -c "[ -f /tika-server-standard-${TIKA_VERSION}.jar.asc ]" || exit 1;
RUN if [ "$CHECK_SIG" = "true" ] ; then gpg --verify
/tika-server-standard-${TIKA_VERSION}.jar.asc
/tika-server-standard-${TIKA_VERSION}.jar; fi
