ACS-5830 - Release 2 arch image for pdf-renderer

Alfresco · Sep 26, 2023 · 436d571 · 436d571
1 parent 144bf7b
commit 436d571
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/engines/aio/pom.xml b/engines/aio/pom.xml
@@ -12,8 +12,7 @@
     </parent>
 
     <properties>
-        <!-- <image.name>alfresco/alfresco-transform-core-aio</image.name> -->
-        <image.name>alfresco/dev</image.name>
+        <image.name>alfresco/alfresco-transform-core-aio</image.name>
         <env.project_artifactId>${project.artifactId}</env.project_artifactId>
     </properties>
 
@@ -340,7 +339,7 @@
                             <images>
                                 <!-- QuayIO image -->
                                  <image>
-                                    <name>${image.name}:alfresco-transform-core-aio-pdf</name>
+                                    <name>${image.name}:${image.tag}</name>
                                     <registry>${image.registry}</registry>
                                     <build>
                                         <buildx>
@@ -359,7 +358,6 @@
                                     </build>
                                 </image>
                                 <!-- DockerHub image -->
-                                <!--
                                 <image>
                                     <name>${image.name}:${image.tag}</name>
                                     <build>
@@ -378,7 +376,6 @@
                                         </buildOptions>
                                     </build>
                                 </image>
-                                -->
                             </images>
                         </configuration>
                         <executions>

diff --git a/engines/pdfrenderer/Dockerfile b/engines/pdfrenderer/Dockerfile
@@ -5,7 +5,7 @@
 FROM alfresco/alfresco-base-java:jre17-rockylinux8-202306121108
 
 ENV ALFRESCO_PDF_RENDERER_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux.tgz
-# 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 ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL=https://nexus.alfresco.com/nexus/service/local/repositories/releases/content/org/alfresco/alfresco-pdf-renderer/1.2/alfresco-pdf-renderer-1.2-linux-arm.tgz
 ENV JAVA_OPTS=""
 
 # Set default user information
@@ -17,7 +17,11 @@ ARG USERID=33001
 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 $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz && \
+    if [ "$(uname -m)" = "x86_64" ]; then \
+      curl -s -S $ALFRESCO_PDF_RENDERER_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \
+    else \
+      curl -s -S $ALFRESCO_PDF_RENDERER_ARM64_LIB_RPM_URL -o alfresco-pdf-renderer-linux.tgz; \
+    fi && \
     tar xf alfresco-pdf-renderer-linux.tgz -C /usr/bin && \
 	rm -f alfresco-pdf-renderer-linux.tgz && \
     yum clean all