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

Fix/acs 5039 libreoffice home arm64 (#843)

Browse Source 
* ACS-5039 - fix libreoffice installation and set LIBREOFFICE_HOME for arm64 - aio

* ACS-5039 - fix libreoffice installation and set LIBREOFFICE_HOME for arm64 - libreoffice

* ACS-5039 - Libreoffice home set by script

* ACS-5039 - Libreoffice home set by docker-entry point script

* ACS-5039 - Added EOL
This commit is contained in:
Wojtek Świętoń 2023-08-07 12:11:48 +02:00 committed by GitHub
parent 301910beca
commit c80b96671d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/aio/Dockerfile
View File

@ -17,7 +17,7 @@ ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-l
ARG LIBREOFFICE_VERSION=7.2.5 ARG LIBREOFFICE_VERSION=7.2.5
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8.8/devel/aarch64/os/Packages/l/libreoffice-core-6.4.7.2-13.el8.aarch64.rpm ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/libreoffice-6.4.7.2-13.el8.aarch64.rpm
ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.1/alfresco-pdf-renderer-1.1-linux.tgz
@ -48,7 +48,7 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${
yum localinstall -y LibreOffice*/RPMS/*.rpm && \ yum localinstall -y LibreOffice*/RPMS/*.rpm && \
rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \ rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \
else \ else \
yum install -y $LIBREOFFICE_ARM64_RPM_URL && \ dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
update-alternatives --set java java-17-openjdk.aarch64; \ update-alternatives --set java java-17-openjdk.aarch64; \
fi && \ fi && \
curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \ curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \
@ -79,4 +79,6 @@ EXPOSE 8090
USER ${AIOUSERNAME} USER ${AIOUSERNAME}
ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar # Copy the script to set LIBREOFFICE_HOME
COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["/docker-entrypoint.sh", "${env.project_artifactId}"]

9
engines/aio/docker-entrypoint.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# Check if the architecture is ARM64 (aarch64)
if [[ "$(uname -m)" != "x86_64" ]]; then
export LIBREOFFICE_HOME=${LIBREOFFICE_HOME:=/usr/lib64/libreoffice}
fi
# Run the Alfresco transformation service JAR file with the specified Java options
exec java $JAVA_OPTS -jar /usr/bin/${1}.jar "$@"

8
engines/libreoffice/Dockerfile
View File

@ -7,7 +7,7 @@ FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108
ARG LIBREOFFICE_VERSION=7.2.5 ARG LIBREOFFICE_VERSION=7.2.5
ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz ENV LIBREOFFICE_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/libreoffice/libreoffice-dist/${LIBREOFFICE_VERSION}/libreoffice-dist-${LIBREOFFICE_VERSION}-linux.gz
ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8.8/devel/aarch64/os/Packages/l/libreoffice-core-6.4.7.2-13.el8.aarch64.rpm ENV LIBREOFFICE_ARM64_RPM_URL=https://dl.rockylinux.org/pub/rocky/8/Devel/aarch64/os/Packages/l/libreoffice-6.4.7.2-13.el8.aarch64.rpm
ENV JAVA_OPTS="" ENV JAVA_OPTS=""
# Set default user information # Set default user information
@ -28,7 +28,7 @@ RUN ln /${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.proj
yum localinstall -y LibreOffice*/RPMS/*.rpm && \ yum localinstall -y LibreOffice*/RPMS/*.rpm && \
rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \ rm -rf libreoffice-dist-*linux.gz LibreOffice_*_Linux_x86-64_rpm; \
else \ else \
yum install -y $LIBREOFFICE_ARM64_RPM_URL && \ dnf --enablerepo=devel install -y $LIBREOFFICE_ARM64_RPM_URL && \
update-alternatives --set java java-17-openjdk.aarch64; \ update-alternatives --set java java-17-openjdk.aarch64; \
fi && \ fi && \
yum clean all yum clean all
@ -46,4 +46,6 @@ EXPOSE 8090
USER ${LIBREUSERNAME} USER ${LIBREUSERNAME}
ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/${env.project_artifactId}.jar # Copy the script to set LIBREOFFICE_HOME
COPY docker-entrypoint.sh /docker-entrypoint.sh
ENTRYPOINT ["/docker-entrypoint.sh", "${env.project_artifactId}"]

9
engines/libreoffice/docker-entrypoint.sh Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
# Check if the architecture is ARM64 (aarch64)
if [[ "$(uname -m)" != "x86_64" ]]; then
export LIBREOFFICE_HOME=${LIBREOFFICE_HOME:=/usr/lib64/libreoffice}
fi
# Run the Alfresco transformation service JAR file with the specified Java options
exec java $JAVA_OPTS -jar /usr/bin/${1}.jar "$@"