test

Alfresco · Jul 22, 2024 · 97307e2 · 97307e2
1 parent cb28625
commit 97307e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -155,7 +155,7 @@ target "repository" {
 
 target "search_liveindexing" {
   matrix = {
-    liveindexing = ["metadata", "path"]
+    liveindexing = ["metadata", "path", "aio"]
   }
   name = "search_liveindexing-${liveindexing}"
   args = {
@@ -173,20 +173,3 @@ target "search_liveindexing" {
   tags = ["alfresco-elasticsearch-live-indexing-${liveindexing}:latest"]
   output = ["type=docker"]
 }
-
-target "search_liveindexing-aio" {
-  args = {
-    LIVEINDEXING = "alfresco-elasticsearch-live-indexing"
-  }
-  dockerfile = "./search/enterprise/common/Dockerfile"
-  inherits = ["java_base"]
-  contexts = {
-    java_base = "target:java_base"
-  }
-  labels = {
-    "org.opencontainers.image.title" = "${PRODUCT_LINE} Enterprise Search - All in one"
-    "org.opencontainers.image.description" = "${PRODUCT_LINE} Enterprise Search -  All in one live indexing"
-  }
-  tags = ["alfresco-elasticsearch-live-indexing:latest"]
-  output = ["type=docker"]
-}
diff --git a/scripts/fetch-artifact.sh b/scripts/fetch-artifact.sh
@@ -16,8 +16,9 @@ for i in $(find . -name artifacts.json -mindepth 2); do
     ARTIFACT_EXT=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].classifier" $i)
     ARTIFACT_GROUP=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].group" $i)
     ARTIFACT_PATH=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].path" $i)
+    ARRIFACT_NAME_ADDON=$(jq -r ".artifacts.acs${INDEX_KEY}[$j].name_addon" $i)
     echo "Downloading $ARTIFACT_GROUP:$ARTIFACT_NAME $ARTIFACT_VERSION from $ARTIFACT_BASEURL"
     wget "${ARTIFACT_BASEURL}/${ARTIFACT_GROUP/\./\/}/${ARTIFACT_NAME}/${ARTIFACT_VERSION}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}" \
-      -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
+      -O ${ARTIFACT_PATH}/${ARTIFACT_NAME}${ARRIFACT_NAME_ADDON}-${ARTIFACT_VERSION}${ARTIFACT_EXT}
   done
 done
diff --git a/search/enterprise/common/artifacts.json b/search/enterprise/common/artifacts.json
@@ -20,7 +20,8 @@
         "version": "4.0.1",
         "path": "search/enterprise/common",
         "classifier": "-app.jar",
-        "group": "org.alfresco"
+        "group": "org.alfresco",
+        "name_addon": "-aio"
       }
     ]
   }