fix add

Alfresco · Jul 26, 2024 · 8bb6e8b · 8bb6e8b
1 parent 2b474d4
commit 8bb6e8b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/tengine/imagemagick/Dockerfile b/tengine/imagemagick/Dockerfile
@@ -4,18 +4,19 @@ EXPOSE 8090
 
 ENV JAVA_OPTS_CONTAINER_FLAGS=-XX:MaxRAMPercentage=80
 ENV IMAGEMAGICK_DEP_RPM_URL=https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-ENV IMAGEMAGICK_RPM_PATH=tengine/imagemagick/imagemagick-distribution*
+ENV IMAGEMAGICK_COMMON_PATH=tengine/imagemagick
 
 ARG ALFRESCO_IMAGEMAGICK_GROUP_NAME
 ARG ALFRESCO_IMAGEMAGICK_GROUP_ID
 ARG ALFRESCO_IMAGEMAGICK_USER_NAME
 ARG ALFRESCO_IMAGEMAGICK_USER_ID
 
-ADD tengine/imagemagick/alfresco-transform-imagemagick*.jar /usr/bin/app.jar
-ADD ${IMAGEMAGICK_RPM_PATH} /tmp/
+ADD ${IMAGEMAGICK_COMMON_PATH}/alfresco-transform-imagemagick*.jar /usr/bin/app.jar
+ADD ${IMAGEMAGICK_COMMON_PATH}/imagemagick-distribution*-el8.rpm /tmp/
+ADD ${IMAGEMAGICK_COMMON_PATH}/imagemagick-distribution*-el8-libs.rpm /tmp/
 
 RUN yum install -y $IMAGEMAGICK_DEP_RPM_URL && \
-    yum install -y /tmp/*-el8.rpm /tmp/*-el8-libs.rpm; \
+    yum install -y /tmp/imagemagick-distribution*-el8.rpm /tmp/imagemagick-distribution*-el8-libs.rpm; \
     yum clean all
 
 RUN groupadd -g ${ALFRESCO_IMAGEMAGICK_GROUP_ID} ${ALFRESCO_IMAGEMAGICK_GROUP_NAME} && \
@@ -27,5 +28,5 @@ USER ${ALFRESCO_IMAGEMAGICK_USER_NAME}
 HEALTHCHECK --interval=20s --timeout=10s --retries=3 --start-period=30s \
   CMD curl -f http://localhost:8090/live || exit 1
 
-COPY tengine/imagemagick/entrypoint.sh /entrypoint.sh
+COPY ${IMAGEMAGICK_COMMON_PATH}/entrypoint.sh /entrypoint.sh
 CMD ["/entrypoint.sh"]