test

Alfresco · Jul 29, 2024 · 7657d4d · 7657d4d
1 parent 52fb69c
commit 7657d4d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -296,7 +296,6 @@ target "tengine_imagemagick" {
     ALFRESCO_IMAGEMAGICK_GROUP_ID = "${ALFRESCO_GROUP_ID}"
     ALFRESCO_IMAGEMAGICK_USER_NAME = "${ALFRESCO_IMAGEMAGICK_USER_NAME}"
     ALFRESCO_IMAGEMAGICK_USER_ID = "${ALFRESCO_IMAGEMAGICK_USER_ID}"
-    VERSION = "7.1.0-16-ci-10"
   }
   labels = {
     "org.opencontainers.image.title" = "${PRODUCT_LINE} Transform Engine Imagemagick"

diff --git a/tengine/imagemagick/Dockerfile b/tengine/imagemagick/Dockerfile
@@ -10,11 +10,10 @@ ARG ALFRESCO_IMAGEMAGICK_GROUP_NAME
 ARG ALFRESCO_IMAGEMAGICK_GROUP_ID
 ARG ALFRESCO_IMAGEMAGICK_USER_NAME
 ARG ALFRESCO_IMAGEMAGICK_USER_ID
-ARG VERSION
 
 ADD ${IMAGEMAGICK_COMMON_PATH}/alfresco-transform-imagemagick*.jar /usr/bin/app.jar
-ADD ${IMAGEMAGICK_COMMON_PATH}/imagemagick-distribution-${VERSION}-el9.rpm /tmp/imagemagick-distribution-el9.rpm
-ADD ${IMAGEMAGICK_COMMON_PATH}/imagemagick-distribution-${VERSION}-libs-el9.rpm /tmp/imagemagick-distribution-libs-el9.rpm
+ADD ${IMAGEMAGICK_COMMON_PATH}/imagemagick-distribution*-el9.rpm /tmp/imagemagick-distribution-el9.rpm
+ADD ${IMAGEMAGICK_COMMON_PATH}/libs/imagemagick-distribution*-libs-el9.rpm /tmp/imagemagick-distribution-libs-el9.rpm
 
 RUN yum install -y $IMAGEMAGICK_DEP_RPM_URL && \
     yum install -y /tmp/imagemagick-distribution-el9.rpm /tmp/imagemagick-distribution-libs-el9.rpm; \

diff --git a/tengine/imagemagick/artifacts.json b/tengine/imagemagick/artifacts.json
@@ -4,7 +4,7 @@
       {
         "name": "imagemagick-distribution",
         "version": "7.1.0-16-ci-10",
-        "path": "tengine/imagemagick",
+        "path": "tengine/imagemagick/libs",
         "classifier": "-libs-el9.rpm",
         "repository": "thirdparty",
         "group": "org.imagemagick"