Merge branch 'master' into ATS-0000_refactor_packages

# Conflicts:
#	alfresco-transform-imagemagick/alfresco-transform-imagemagick-centos7/scripts/build-rpms.sh
#	alfresco-transform-imagemagick/alfresco-transform-imagemagick-rockylinux8/scripts/build-rpms.sh
#	engines/aio/Dockerfile
#	engines/imagemagick/README.md
#	engines/imagemagick/scripts/build-rpms.sh
This commit is contained in:
alandavis
2022-08-02 12:03:13 +01:00
12 changed files with 44 additions and 37 deletions

View File

@@ -2,7 +2,7 @@
# alfresco-pdf-renderer uses the PDFium library from Google Inc. See the license at https://pdfium.googlesource.com/pdfium/+/master/LICENSE or in /pdfium.txt.
FROM alfresco/alfresco-base-java:jre11-centos7-202205121725
FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
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 JAVA_OPTS=""