chore(imagebuilder): optimize waiting conditions

Author: duanhongyi

Makefile

@@ -14,7 +14,7 @@ include versioning.mk
 
 SHELL_SCRIPTS = $(wildcard _scripts/*.sh) \
 				rootfs/usr/local/bin/* \
-				rootfs/pack/*
+				rootfs/imagebuilder/*
 
 # The following variables describe the containerized development environment
 # and other build options
@@ -57,14 +57,11 @@ kube-service: kube-secrets
 kube-clean:
 	- kubectl delete rc drycc-${SHORT_NAME}-rc
 
-test: test-style test-unit test-functional
+test: test-style test-functional
 
 test-style:
 	${DEV_ENV_CMD} shellcheck $(SHELL_SCRIPTS)
 
-test-unit:
-	docker run --entrypoint /usr/bin/env ${IMAGE} python3 -m unittest procfile
-
 test-functional:
 	@echo "Implement functional tests in _tests directory"
 

rootfs/Dockerfile

@@ -10,4 +10,4 @@ RUN /imagebuilder/install
 WORKDIR /app
 ENV HOME /app
 
-#ENTRYPOINT ["/imagebuilder/build"]
+ENTRYPOINT ["/imagebuilder/build"]

rootfs/imagebuilder/build

@@ -13,10 +13,13 @@ trap clean_before_exit EXIT
 
 function waiting_podman {
     echo "---> Waiting podman system service"
-    for _ in {0..3};do
+    for i in {0..3}; do
         pid=$(pgrep podman)
         if [ ! -n "$pid" ]; then
             sleep 3
+        elif [ ! -n "$pid" ] && [[ $i == 3 ]]; then
+            echo "---> Podman system service failed to start"
+            exit 1
         else
             sleep 1
             break
@@ -26,10 +29,13 @@ function waiting_podman {
 
 function waiting_caddy {
     echo "---> Waiting caddy reverse-proxy"
-    for _ in {0..3};do
+    for i in {0..4}; do
         pid=$(pgrep caddy)
         if [ ! -n "$pid" ]; then
             sleep 3
+        elif [ ! -n "$pid" ] && [[ $i == 3 ]]; then
+            echo "---> Caddy failed to start"
+            exit 1
         else
             sleep 1
             break