Merge pull request #40 from felliott/feature/libreoffice-mirror-redux

Revert unoconv back to old libreoffice mirror

Author: mattclark

mfr/Dockerfile

@@ -46,14 +46,15 @@ RUN apt-get update \
  curl \
  && rm -rf /var/lib/apt/lists/*
 
-ENV LIBREOFFICE_VERSION 6.0.1.1
-ENV LIBREOFFICE_ARCHIVE LibreOffice_6.0.1.1_Linux_x86-64_deb.tar.gz
+ENV LIBREOFFICE_VERSION 6.0.2.1
+ENV LIBREOFFICE_ARCHIVE LibreOffice_6.0.2.1_Linux_x86-64_deb.tar.gz
+ENV LIBREOFFICE_MIRROR_URL https://downloadarchive.documentfoundation.org/libreoffice/old/
 RUN apt-get update \
  && apt-get install -y \
  curl \
  && gpg --keyserver pool.sks-keyservers.net --recv-keys AFEEAEA3 \
- && curl -SL "https://downloadarchive.documentfoundation.org/libreoffice/old/$LIBREOFFICE_VERSION/deb/x86_64/$LIBREOFFICE_ARCHIVE" -o $LIBREOFFICE_ARCHIVE \
- && curl -SL "https://downloadarchive.documentfoundation.org/libreoffice/old/$LIBREOFFICE_VERSION/deb/x86_64/$LIBREOFFICE_ARCHIVE.asc" -o $LIBREOFFICE_ARCHIVE.asc \
+ && curl -SL "$LIBREOFFICE_MIRROR_URL/$LIBREOFFICE_VERSION/deb/x86_64/$LIBREOFFICE_ARCHIVE" -o $LIBREOFFICE_ARCHIVE \
+ && curl -SL "$LIBREOFFICE_MIRROR_URL/$LIBREOFFICE_VERSION/deb/x86_64/$LIBREOFFICE_ARCHIVE.asc" -o $LIBREOFFICE_ARCHIVE.asc \
  && gpg --verify "$LIBREOFFICE_ARCHIVE.asc" \
  && mkdir /tmp/libreoffice \
  && tar -xvf "$LIBREOFFICE_ARCHIVE" -C /tmp/libreoffice/ --strip-components=1 \

unoconv/Dockerfile

@@ -46,9 +46,9 @@ RUN apt-get update \
 RUN usermod -d /home www-data \
  && chown www-data:www-data /home
 
-ENV LIBREOFFICE_VERSION 6.0.2
+ENV LIBREOFFICE_VERSION 6.0.2.1
 ENV LIBREOFFICE_ARCHIVE LibreOffice_6.0.2.1_Linux_x86-64_deb.tar.gz
-ENV LIBREOFFICE_MIRROR_URL https://ftp.osuosl.org/pub/tdf/libreoffice/testing/
+ENV LIBREOFFICE_MIRROR_URL https://downloadarchive.documentfoundation.org/libreoffice/old/
 RUN apt-get update \
  && apt-get install -y \
  curl \