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 887c9b4ef607d3f3c5e2790552bfab7fac78d817 Author: David Meikle <[email protected]> AuthorDate: Sat Jan 11 01:38:59 2020 +0000 Updated download commands to configure retries and exit if downloads fail --- full/Dockerfile | 12 +++++++----- minimal/Dockerfile | 10 ++++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/full/Dockerfile b/full/Dockerfile index ef43a4a..6d63e76 100644 --- a/full/Dockerfile +++ b/full/Dockerfile @@ -18,7 +18,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-11-jre-headless gd 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 \ - && DEBIAN_FRONTEND=noninteractive apt-get install -y curl xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract + && DEBIAN_FRONTEND=noninteractive apt-get install -y xfonts-utils fonts-freefont-ttf fonts-liberation ttf-mscorefonts-installer wget cabextract FROM dependencies as fetch_tika ARG TIKA_VERSION @@ -29,12 +29,14 @@ 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 curl wget \ - && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \ - && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \ +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install gnupg2 \ + && 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 \ - && wget $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 ]" || 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 FROM dependencies as runtime diff --git a/minimal/Dockerfile b/minimal/Dockerfile index 6554be9..80da206 100644 --- a/minimal/Dockerfile +++ b/minimal/Dockerfile @@ -24,12 +24,14 @@ 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 curl wget \ - && curl -sSL https://www.apache.org/dist/tika/KEYS | gpg --import \ - && wget $NEAREST_TIKA_SERVER_URL -O /tika-server-${TIKA_VERSION}.jar || rm /tika-server-${TIKA_VERSION}.jar \ +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 \ - && wget $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 ]" || 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 FROM dependencies as runtime
