Merge pull request #36 from ika-rwth-aachen/fix/slim-github-ci

Fix slim integration for multiarch builds in GitHub CI
ika-rwth-aachen · Oct 28, 2024 · 1ca378d · 1ca378d
2 parents cd65abe + 8b8d885
commit 1ca378d
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/scripts/ci.sh b/scripts/ci.sh
@@ -96,14 +96,12 @@ for PLATFORM in "${PLATFORMS[@]}"; do
         [[ -n "${_IMAGE_POSTFIX}" ]] && slim_image="${slim_image}${_IMAGE_POSTFIX}"
         [[ "${_ENABLE_IMAGE_PUSH}" != "true" || "${ENABLE_SINGLEARCH_PUSH}" == "true" ]] && image="${image}-${PLATFORM}"
         [[ "${_ENABLE_IMAGE_PUSH}" != "true" || "${ENABLE_SINGLEARCH_PUSH}" == "true" ]] && slim_image="${slim_image}-${PLATFORM}"
-        if [[ "${_ENABLE_IMAGE_PUSH}" == "true" || "${ENABLE_SINGLEARCH_PUSH}" == "true" ]]; then
-            [[ "${ENABLE_SINGLEARCH_PUSH}" != "true" ]] && docker tag "${slim_image}-${PLATFORM}" "${slim_image}"
+        cd dist_linux*
+        ./slim build --target "${image}" --tag "${slim_image}" ${SLIM_BUILD_ARGS}
+        if [[ "${_ENABLE_IMAGE_PUSH}" == "true" ]]; then
             docker push "${slim_image}"
-        else
-            cd dist_linux*
-            ./slim build --target "${image}" --tag "${slim_image}" ${SLIM_BUILD_ARGS}
-            cd -
         fi
+        cd -
         close_log_group
     fi
 done