build-scripts/image.sh

@@ -25,22 +25,14 @@ gobool_to_int() {
 
 NGX_DEBUG=$(gobool_to_int "${NGX_DEBUG:-0}" 0)
 case "${NGX_DEBUG}" in
-0 )
-	img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}"
-	img_fq="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}"
-;;
-1 )
-	img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-debug"
-	img_fq="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}-debug"
-;;
+0 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}" ;;
+1 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}-debug" ;;
 esac
 
-buildah bud \
+exec buildah bud \
   -f ./Dockerfile \
-  -t "${img_fq}" \
+  -t "${img}" \
   --env "ANGIE_VERSION=${ANGIE_VERSION}" \
   --env "NGX_DEBUG=${NGX_DEBUG}" \
   --pull=missing --no-cache \
   --build-arg "IMAGE_VERSION=${IMAGE_VERSION}" \
-
-podman tag "${img_fq}" "${img}"

image-entry.d/02-nonroot.envsh

@@ -3,5 +3,5 @@
 unset IEP_ROOT
 IEP_ROOT=1
 # [ "$(env stat -Lc %u /proc/$$)" = 0 ] || IEP_ROOT=0
-[ "$(id -u)" = 0 ] || IEP_ROOT=0
+[ "$(id -n)" = 0 ] || IEP_ROOT=0
 export IEP_ROOT