krd/angie-conv-image
1
0
Fork 0
Code

Compare commits

base: krd:921dd8fe9fa8b0c9fdb35ea7c06db7e1cd185993
Branches Tags
krd:main
..
compare: krd:d443811e1af8d3bd65d18058208995d0a0becd12
Branches Tags
krd:main

2 Commits
921dd8fe9f ... d443811e1a

Author SHA1 Message Date
Konstantin Demin
d443811e1a
build-scripts: short/full tags for final image 2024-09-30 21:44:02 +03:00
Konstantin Demin
ab3ec5752b
image-entry: fix user detection 
fixes 86af6345
 2024-09-30 21:43:24 +03:00
2 changed files with 13 additions and 5 deletions
Show Stats Expand all files Collapse all files

16
build-scripts/image.sh
View File

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

2
image-entry.d/02-nonroot.envsh
View File

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