Making the image size check more generic as per comments.

Author: Kaniska244

.github/actions/smoke-test/build.sh

@@ -8,13 +8,9 @@ echo "(*) Installing @devcontainer/cli"
 npm install -g @devcontainers/cli
 
 id_label="test-container=${IMAGE}"
-id_image="universal-test-image"
-if [ $IMAGE == "universal" ]; then
-    echo "(*) Building image - ${IMAGE}"
-    devcontainer build --image-name ${id_image} --workspace-folder "src/${IMAGE}/"
-    echo "(*) Starting container - ${IMAGE}"
-    devcontainer up --id-label ${id_label} --workspace-folder "src/${IMAGE}/"
-else
-    echo "(*) Building image - ${IMAGE}"
-    devcontainer up --id-label ${id_label} --workspace-folder "src/${IMAGE}/"
-fi
+id_image="${IMAGE}-test-image"
+echo "(*) Building image - ${IMAGE}"
+devcontainer build --image-name ${id_image} --workspace-folder "src/${IMAGE}/"
+echo "(*) Starting container - ${IMAGE}"
+devcontainer up --id-label ${id_label} --workspace-folder "src/${IMAGE}/"
+

.github/actions/smoke-test/check-image-size.sh

@@ -36,14 +36,8 @@ check_image_size() {
     # call install_bc
     install_bc
 
-    if [ $IMAGE == "universal" ]; then
-        #Read the image id of the original image, not the modified image with uid and gid
-        IMAGE_ID=$(docker images -q  --filter=reference="$id_image")
-    else
-        CONTAINER_ID=$(docker ps -q --filter "label=test-container=$IMAGE")
-        # Find the image ID of the container
-        IMAGE_ID=$(docker inspect --format='{{.Image}}' "$CONTAINER_ID")    
-    fi
+    #Read the image id of the original image, not the modified image with uid and gid
+    IMAGE_ID=$(docker images -q  --filter=reference="$id_image")   
     # Find the size of the image
     IMAGE_SIZE=$(docker image inspect --format='{{.Size}}' "$IMAGE_ID")
     # Output the size

.github/actions/smoke-test/test.sh

@@ -10,7 +10,7 @@ set -e
 # Run actual test
 echo "(*) Running test..."
 id_label="test-container=${IMAGE}"
-id_image="universal-test-image"
+id_image="${IMAGE}-test-image"
 devcontainer exec --workspace-folder $(pwd)/src/$IMAGE  --id-label ${id_label} /bin/sh -c 'set -e && if [ -f "test-project/test.sh" ]; then cd test-project && if [ "$(id -u)" = "0" ]; then chmod +x test.sh; else sudo chmod +x test.sh; fi && ./test.sh; else ls -a; fi'
 
 echo "(*) Docker image details..."