inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-07 17:48:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MNT-20337/REPO-4534/ATS-484 LibreOffice 6.1.6

Browse Source
This commit is contained in:
Alan Davis
2019-07-17 12:57:57 +01:00
parent 84cdc9d39c
commit afe31b73e3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
alfresco-docker-libreoffice/Dockerfile
View File

@@ -4,7 +4,7 @@
FROM alfresco/alfresco-base-java:11.0.1-openjdk-centos-7-6784d76a7b81
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/5.4.6/libreoffice-dist-5.4.6-linux.gz
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/6.1.6/libreoffice-dist-6.1.6-linux.gz
ENV LIBREOFFICE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/libreoffice.txt
ENV JAVA_OPTS=""
@@ -18,8 +18,8 @@ COPY target/alfresco-docker-libreoffice-${env.project_version}.jar libreoffice-d
RUN ln /alfresco-docker-libreoffice-${env.project_version}.jar /usr/bin/alfresco-docker-libreoffice.jar && \
yum install -y cairo cups-libs libSM && \
test -f libreoffice-dist-5.4.6-linux.gz && \
ln -s libreoffice-dist-5.4.6-linux.gz libreoffice-dist-linux.gz || \
test -f libreoffice-dist-6.1.6-linux.gz && \
ln -s libreoffice-dist-6.1.6-linux.gz libreoffice-dist-linux.gz || \
curl -s -S $LIBREOFFICE_RPM_URL -o libreoffice-dist-linux.gz && \
curl -s -S $LIBREOFFICE_LICENSE_FILE -o libreoffice.txt && \
tar xzf libreoffice-dist-linux.gz && \

2
alfresco-docker-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java
View File

@@ -57,7 +57,7 @@ public class LibreOfficeJavaExecutor implements JavaExecutor
private static final Logger logger = LoggerFactory.getLogger(LibreOfficeJavaExecutor.class);
private static final int JODCONVERTER_TRANSFORMATION_ERROR_CODE = 3088;
private static final String OFFICE_HOME = "/opt/libreoffice5.4";
private static final String OFFICE_HOME = "/opt/libreoffice6.1";
private JodConverter jodconverter;