Skip to content

Commit a02bcbb

Browse files
committed
Unoconv 6.0.1.1
1 parent ddf07af commit a02bcbb

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

unoconv/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.4-slim
1+
FROM python:3.6-slim
22

33
RUN apt-get update \
44
&& apt-get install -y \
@@ -46,8 +46,8 @@ RUN apt-get update \
4646
RUN usermod -d /home www-data \
4747
&& chown www-data:www-data /home
4848

49-
ENV LIBREOFFICE_VERSION 4.4.4.3
50-
ENV LIBREOFFICE_ARCHIVE LibreOffice_4.4.4.3_Linux_x86-64_deb.tar.gz
49+
ENV LIBREOFFICE_VERSION 6.0.1.1
50+
ENV LIBREOFFICE_ARCHIVE LibreOffice_6.0.1.1_Linux_x86-64_deb.tar.gz
5151
RUN apt-get update \
5252
&& apt-get install -y \
5353
curl \
@@ -69,15 +69,12 @@ RUN apt-get update \
6969
ADD https://raw.githubusercontent.com/dagwieers/unoconv/master/unoconv /usr/bin/unoconv
7070
RUN chmod +xr /usr/bin/unoconv
7171

72-
ENV UNO_PATH=/opt/libreoffice4.4
73-
74-
# first run will fail, however it will setup the environment for the next run to be successful
75-
RUN gosu www-data /usr/bin/unoconv --listener --server=0.0.0.0 --port=2002 -vvv
72+
ENV UNO_PATH=/opt/libreoffice6.0
7673

7774
COPY entrypoint.sh /entrypoint.sh
7875
RUN chmod +x /entrypoint.sh
7976
ENTRYPOINT ["/entrypoint.sh"]
8077

8178
EXPOSE 2002
8279

83-
CMD ["/usr/bin/unoconv", "--listener", "--server=0.0.0.0", "--port=2002", "-vvv"]
80+
CMD ["gosu", "www-data", "/opt/libreoffice6.0/program/python", "-u", "/usr/bin/unoconv", "--listener", "--server=0.0.0.0", "--port=2002", "-vvv"]

unoconv/entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ set -e
33

44
chown -R www-data:www-data /home
55

6-
exec gosu www-data "$@"
6+
exec "$@"

0 commit comments

Comments
 (0)