diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
index e38b738e..c27046b3 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -9,9 +9,10 @@ FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca
ENV APACHE_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/Apache%202.0.txt
-ARG IMAGEMAGICK_VERSION=7.0.7-27
+ARG IMAGEMAGICK_VERSION=7.0.10-11
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm
+ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
ENV IMAGEMAGICK_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
ARG LIBREOFFICE_VERSION=6.3.5
@@ -35,6 +36,8 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr
curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \
curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \
curl -s -S $IMAGEMAGICK_LICENSE_FILE -o ImageMagick-license.txt && \
+ curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \
+ yum localinstall -y imagemagick-epel-dep.rpm && \
yum localinstall -y imagemagick-distribution-*linux.rpm && \
rm -f imagemagick-distribution-*.rpm && \
yum clean all && \
@@ -67,4 +70,4 @@ EXPOSE 8090
USER ${AIOUSERNAME}
-ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-transform-core-aio-boot.jar
\ No newline at end of file
+ENTRYPOINT java $JAVA_OPTS -jar /usr/bin/alfresco-transform-core-aio-boot.jar
diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
index 02ef6ac9..4b115038 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/resources/application-default.yaml
@@ -7,8 +7,8 @@ transform:
libreoffice:
path: ${LIBREOFFICE_HOME:/opt/libreoffice6.3}
imagemagick:
- root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.7}
- dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.7/lib}
+ root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.10}
+ dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.10/lib}
exe: ${IMAGEMAGICK_EXE:/usr/bin/convert}
coders: ${IMAGEMAGICK_CODERS:}
- config: ${IMAGEMAGICK_CONFIG:}
\ No newline at end of file
+ config: ${IMAGEMAGICK_CONFIG:}
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
index 645ae4cc..84fb4c1c 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/Dockerfile
@@ -4,10 +4,11 @@
FROM alfresco/alfresco-base-java:11.0.7-openjdk-centos-7-145f5d28c8ca
-ARG IMAGEMAGICK_VERSION=7.0.7-27
+ARG IMAGEMAGICK_VERSION=7.0.10-11
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-linux.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-libs-linux.rpm
+ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
ENV IMAGEMAGICK_LICENSE_FILE=https://github.com/Alfresco/acs-community-packaging/blob/master/distribution/src/main/resources/licenses/3rd-party/ImageMagick-license.txt
ENV JAVA_OPTS=""
@@ -23,6 +24,8 @@ RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${
curl -s -S $IMAGEMAGICK_RPM_URL -o imagemagick-distribution-linux.rpm && \
curl -s -S $IMAGEMAGICK_LIB_RPM_URL -o imagemagick-distribution-libs-linux.rpm && \
curl -s -S $IMAGEMAGICK_LICENSE_FILE -o ImageMagick-license.txt && \
+ curl -s -S $IMAGEMAGICK_DEP_RPM_URL -o imagemagick-epel-dep.rpm && \
+ yum localinstall -y imagemagick-epel-dep.rpm && \
yum localinstall -y imagemagick-distribution-*linux.rpm && \
rm -f imagemagick-distribution-*.rpm && \
yum clean all
diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
index 06a4f65f..6b813c68 100644
--- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
+++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/main/resources/application-default.yaml
@@ -5,8 +5,8 @@ transform:
config:
location: classpath:imagemagick_engine_config.json
imagemagick:
- root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.7}
- dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.7/lib}
+ root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.10}
+ dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.10/lib}
exe: ${IMAGEMAGICK_EXE:/usr/bin/convert}
coders: ${IMAGEMAGICK_CODERS:}
- config: ${IMAGEMAGICK_CONFIG:}
\ No newline at end of file
+ config: ${IMAGEMAGICK_CONFIG:}
diff --git a/pom.xml b/pom.xml
index a102ee35..c1071232 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
11
11
11
-
+
latest
2.0.19
3.0.1.1
@@ -32,7 +32,7 @@
false
-
+
full-build
@@ -344,8 +344,8 @@
true
/usr/bin/convert
- /usr/lib64/ImageMagick-7.0.7/lib
- /usr/lib64/ImageMagick-7.0.7
+ /usr/lib64/ImageMagick-7.0.10/lib
+ /usr/lib64/ImageMagick-7.0.10
/opt/libreoffice6.3
/usr/bin/alfresco-pdf-renderer
${project.build.directory}