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

@@ -1,4 +1,4 @@
FROM alfresco/alfresco-base-java:jre11-centos7-202207110835
FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
ARG EXIFTOOL_VERSION=12.25
ARG EXIFTOOL_FOLDER=Image-ExifTool-${EXIFTOOL_VERSION}