Merge branch 'release/19.1.0'

Author: felliott

CHANGELOG

@@ -2,6 +2,13 @@
 ChangeLog
 *********
 
+19.1.0 (2019-09-25)
+===================
+- Feature: Update MFR's Dockerfile to be based off of Debian Buster and install LibreOffice via
+apt-get. It had been pulling down a LibreOffice .deb from LO's archive, but they only make the most
+recent patch version available. This meant that the Dockerfile had to be update with every patch
+release. The version in Debian Buster is v6.1.5.
+
 19.0.2 (2019-06-21)
 ===================
 - Fix: Update MFR dependencies on jinja and mistune python libraries.

Dockerfile

@@ -1,10 +1,12 @@
-FROM python:3.5-slim-stretch
+FROM python:3.5-slim-buster
 
 # ensure unoconv can locate the uno library
-ENV PYTHONPATH=/usr/lib/python3/dist-packages
+ENV PYTHONPATH /usr/lib/python3/dist-packages
 
 RUN usermod -d /home www-data \
  && chown www-data:www-data /home \
+ # -slim images strip man dirs, but java won't install unless this dir exists.
+ && mkdir -p /usr/share/man/man1 \
  && apt-get update \
  # mfr dependencies
  && apt-get install -y \
@@ -27,6 +29,8 @@ RUN usermod -d /home www-data \
  freecad \
  # pspp dependencies
  pspp \
+ # unoconv dependencies
+ libreoffice \
  # gosu dependencies
  curl \
  gnupg2 \
@@ -53,37 +57,8 @@ RUN usermod -d /home www-data \
  && rm -rf /var/lib/apt/lists/* \
  && pip install -U pip \
  && pip install setuptools==37.0.0 \
- && mkdir -p /code
-
-ENV LIBREOFFICE_VERSION 6.1.6
-ENV LIBREOFFICE_ARCHIVE LibreOffice_6.1.6_Linux_x86-64_deb.tar.gz
-ENV LIBREOFFICE_MIRROR_URL https://download.documentfoundation.org/libreoffice/stable/
-RUN apt-get update \
- && apt-get install -y \
- curl \
- gnupg2 \
- && for server in hkp://ipv4.pool.sks-keyservers.net:80 \
- hkp://ha.pool.sks-keyservers.net:80 \
- hkp://pgp.mit.edu:80 \
- hkp://keyserver.pgp.com:80 \
- ; do \
- gpg --keyserver "$server" --recv-keys AFEEAEA3 && break || echo "Trying new server..." \
- ; done \
- && 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 \
- && dpkg -i /tmp/libreoffice/**/*.deb \
- && rm $LIBREOFFICE_ARCHIVE* \
- && rm -Rf /tmp/libreoffice \
- && apt-get clean \
- && apt-get autoremove -y \
- curl \
- gnupg2 \
- && rm -rf /var/lib/apt/lists/*
-
-RUN pip install unoconv==0.8.2
+ && mkdir -p /code \
+ && pip install unoconv==0.8.2
 
 WORKDIR /code
 

mfr/version.py

@@ -1 +1 @@
-__version__ = '19.0.2'
+__version__ = '19.1.0'