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

Merge branch 'master' into ATS-0000_refactor_packages

Browse Source 
* Removal of the ImageMagick rpm creation code
* removal of eps code (had already been done on this branch)

# Conflicts:
#	alfresco-transform-core-aio/alfresco-transform-core-aio/pom.xml
#	alfresco-transform-imagemagick/alfresco-transform-imagemagick/pom.xml
#	alfresco-transform-libreoffice/alfresco-transform-libreoffice/pom.xml
#	alfresco-transform-misc/alfresco-transform-misc/pom.xml
#	alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/pom.xml
#	alfresco-transform-tika/alfresco-transform-tika/pom.xml
#	deprecated/alfresco-transformer-base/pom.xml
#	engines/aio/pom.xml
#	engines/example/pom.xml
#	engines/imagemagick/pom.xml
#	engines/imagemagick/rockylinux8/README.md
#	engines/imagemagick/rockylinux8/scripts/build-rpms.sh
#	engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTransformationIT.java
#	engines/libreoffice/pom.xml
#	engines/pdfrenderer/pom.xml
#	engines/tika/pom.xml
#	model/pom.xml
#	pom.xml
This commit is contained in:
alandavis
2022-09-07 10:59:54 +01:00
parent 64677eeee4 9308cce484
commit 1abbae8e5b
13 changed files with 24 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engines/imagemagick/Dockerfile
View File

@@ -4,10 +4,11 @@
FROM alfresco/alfresco-base-java:jre17-rockylinux8-202207110835
# For other ImageMagick versions please look at https://github.com/Alfresco/imagemagick-build tags
ARG IMAGEMAGICK_VERSION=7.1.0-16
ENV IMAGEMAGICK_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/thirdparty/content/org/imagemagick/imagemagick-distribution/${IMAGEMAGICK_VERSION}/imagemagick-distribution-${IMAGEMAGICK_VERSION}-rockylinux8.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-rockylinux8.rpm
ENV IMAGEMAGICK_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-${IMAGEMAGICK_VERSION}.x86_64.rpm
ENV IMAGEMAGICK_LIB_RPM_URL=https://github.com/Alfresco/imagemagick-build/releases/download/v${IMAGEMAGICK_VERSION}/ImageMagick-libs-${IMAGEMAGICK_VERSION}.x86_64.rpm
ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
ENV JAVA_OPTS=""
@@ -22,7 +23,8 @@ COPY target/${env.project_artifactId}-${env.project_version}.jar /usr/bin
RUN ln /usr/bin/${env.project_artifactId}-${env.project_version}.jar /usr/bin/${env.project_artifactId}.jar && \
yum install -y $IMAGEMAGICK_DEP_RPM_URL && \
yum install -y $IMAGEMAGICK_LIB_RPM_URL $IMAGEMAGICK_RPM_URL && \
yum clean all
yum clean all && \
rpm -e --nodeps libgs
ADD target/generated-resources/licenses /licenses
ADD target/generated-resources/licenses.xml /licenses/