From b256bb2dc244073c570bbccc9d41d71f08269af5 Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Sun, 20 Mar 2022 11:29:26 +0000
Subject: [PATCH] ATS-986: Experiment to switch Java Base Image (from CentOS 7
 to Rocky Linux 8)

- temporarily downgrade from I/M 7.1.0-16 to 7.1.0-7
- fix ExifTool tests (perl was apparently removed - commented out "yum autoremove make" for now)

- TODO fix I/M rpm build scripts for "linux" (for CentOS 8 / Rocky Linux 8)
- TODO upload built rpms to Nexus
- TODO review & remove commented out "yum autoremove make" (check green quay.io)
---
 .../alfresco-transform-core-aio-boot/Dockerfile              | 5 +++--
 .../alfresco-transform-tika-boot/Dockerfile                  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

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 9103d0e9..51d8a199 100644
--- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
+++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/Dockerfile
@@ -48,13 +48,14 @@ RUN ln /usr/bin/alfresco-transform-core-aio-boot-${env.project_version}.jar /usr
 	rm -f alfresco-pdf-renderer-linux.tgz && \
     curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \
     tar xzf ${EXIFTOOL_FOLDER}.tgz && \
-    yum -y install perl perl-ExtUtils-MakeMaker make && \
+    yum -y install perl && \
     (cd ./${EXIFTOOL_FOLDER} && \
     perl Makefile.PL && \
     make && \
     make test && \
     make install) && \
-    yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
+    # yum -y autoremove make && \
+    rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
     yum clean all
 
 ADD target/generated-resources/licenses              /licenses
diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
index 2a66744c..f2b89464 100644
--- a/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
+++ b/alfresco-transform-tika/alfresco-transform-tika-boot/Dockerfile
@@ -21,13 +21,14 @@ 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 && \
     curl -s -S $EXIFTOOL_URL -o ${EXIFTOOL_FOLDER}.tgz && \
     tar xzf ${EXIFTOOL_FOLDER}.tgz && \
-    yum -y install perl perl-ExtUtils-MakeMaker make && \
+    yum -y install perl && \
     (cd ./${EXIFTOOL_FOLDER} && \
     perl Makefile.PL && \
     make && \
     make test && \
     make install) && \
-    yum -y autoremove perl-ExtUtils-MakeMaker make && rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
+    # yum -y autoremove make && \
+    rm -rf ${EXIFTOOL_FOLDER} ${EXIFTOOL_FOLDER}.tgz && \
     yum clean all
 
 ADD target/generated-resources/licenses              /licenses