- [build](bld.mk) Harmonize [bld.mk](bld.mk) between repositories.

- [build](dkr.mk) Harmonize [dkr.mk](dkr.mk) between repositories.
- [docker](src/docker) Added switch to set run as user [docker-service.sh](src/docker/bin/docker-service.sh).

Author: mlan

CHANGELOG.md

@@ -2,8 +2,12 @@
 
 - [build](Dockerfile) Switch to php82 and make it a build argument: `--build-arg PHP_VER=php82`.
 - [build](Makefile) Now set `DOCKER_BUILDKIT=1` since we don't use special symbolic links.
+- [build](bld.mk) Harmonize [bld.mk](bld.mk) between repositories.
+- [build](dkr.mk) Harmonize [dkr.mk](dkr.mk) between repositories.
+- [docker](src/docker) Added switch to set run as user [docker-service.sh](src/docker/bin/docker-service.sh).
 - [docker](src/docker) Improve debug message in [docker-service.sh](src/docker/bin/docker-service.sh).
 
+
 # 1.1.6
 
 - [build](Makefile) Now use alpine:3.18 (asterisk:18.15.1).

bld.mk

@@ -10,12 +10,15 @@ BLD_CMT  ?= HEAD
 #
 # $(call bld_tags,mini,) -> mini mini-1.2.3 mini-1.2 mini-1
 # $(call bld_tags,full,) -> latest full 1.2.3 1.2 1 full-1.2.3 full-1.2 full-1
+# $(call bld_tags,,) -> latest 1.2.3 1.2 1
 #
 # $(call bld_tags,mini,something) -> mini-something
 # $(call bld_tags,full,something) -> something full-something
+# $(call bld_tags,,something) -> something
 #
 # $(call bld_tags,mini,latest) -> mini
 # $(call bld_tags,full,latest) -> latest full
+# $(call bld_tags,,latest) -> latest
 #
 bld_tags = $(if $(2),\
 $(call bld_ver,$(1),$(2)),\
@@ -24,20 +27,31 @@ $(call bld_ver,$(1),latest) $(call bld_ver,$(1),$(call bld_gittags)))
 #
 # $(call bld_ver,mini,something) -> mini-something
 # $(call bld_ver,full,something) -> something full-something
+# $(call bld_ver,,something) -> something
 #
 # $(call bld_ver,mini,latest) -> mini
 # $(call bld_ver,full,latest) -> latest full
+# $(call bld_ver,,latest) -> latest
 #
-bld_ver = $(if $(findstring $(BLD_TGT),$(1)),\
+bld_ver = $(if $(1),\
+$(if $(findstring $(BLD_TGT),$(1)),\
 $(if $(findstring latest,$(2)),latest $(1),$(2) $(addprefix $(1)-,$(2))),\
-$(if $(findstring latest,$(2)),$(1),$(addprefix $(1)-,$(2))))
+$(if $(findstring latest,$(2)),$(1),$(addprefix $(1)-,$(2)))),\
+$(2))
 
 #
 # $(call bld_tag,full,) -> full
-# $(call bld_tag,full,latest) -> full
+# $(call bld_tag,,) -> latest
+#
 # $(call bld_tag,full,something) -> full-something
+# $(call bld_tag,,something) -> something
+#
+# $(call bld_tag,full,latest) -> full
+# $(call bld_tag,,latest) -> latest
 #
-bld_tag = $(if $(2),$(if $(findstring latest,$(2)),$(1),$(1)-$(2)),$(1))
+bld_tag = $(strip $(if $(1),\
+$(if $(2),$(if $(findstring latest,$(2)),$(1),$(1)-$(2)),$(1)),\
+$(if $(2),$(2),latest)))
 
 #
 # $(call bld_gittags,HEAD) -> 1.2.3 1.2 1

dkr.mk

@@ -33,6 +33,32 @@ dkr_cnt_pid  = $(shell docker inspect --format '{{.State.Pid}}' $(1))
 #
 dkr_img_env  = $(shell docker inspect -f \
 	'{{range .Config.Env}}{{println .}}{{end}}' $(1) | grep -P "^$(2)=" | sed 's/[^=]*=//'
+
+#
+# $(call dkr_cnt_state,demo-app-1) -> docker inspect -f '{{.State.Status}}' demo-app-1
+#
+dkr_cnt_state = docker inspect -f '{{.State.Status}}' $(1)
+
+#
+# $(call dkr_cnt_wait_run,test-db,180) -> i=0; time while ! [ "$(docker inspect -f '{{.State.Status}}'  test-db)" = "running" ]; do sleep 1; i=$((i+1)); if [[ $i > 180 ]]; then echo test-db timeout with state: $(docker inspect -f '{{.State.Status}}'  test-db); break; fi; done
+#
+dkr_cnt_wait_run = i=0; time while ! [ "$$($(call dkr_cnt_state, $(1)))" = "running" ]; do sleep 1; i=$$((i+1)); if [[ $$i > $(2) ]]; then echo $(1) timeout with state: $$($(call dkr_cnt_state, $(1))); break; fi; done
+
+#
+# $(call dkr_srv_wait_run,180,app) -> wait up to 180s for app to enter state running
+#
+dkr_srv_wait_run = $(call dkr_cnt_wait_run,$(call dkr_srv_cnt $(1)),$(2))
+
+#
+# $(call dkr_cnt_wait_log,app,ready for connections) -> time docker logs -f app | sed -n '/ready for connections/{p;q}'
+#
+dkr_cnt_wait_log = time docker logs -f $(1) 2>&1 | sed -n '/$(2)/{p;q}'
+
+#
+# $(call dkr_pull_missing,mariadb:latest) -> if ! docker image inspect mariadb:latest &>/dev/null; then docker pull mariadb:latest; fi
+#
+dkr_pull_missing = if ! docker image inspect $(1) &>/dev/null; then docker pull $(1); fi
+
 #
 # List IPs of containers
 #

src/docker/bin/docker-service.sh

@@ -27,6 +27,7 @@ usage() {
 		  -l       activate logging (svlogd)
 		  -n name  use this name instead of command
 		  -s file  source file
+		  -u user  run command as this user
 		  -q       send stdout and stderr to /dev/null
 
 		 EXAMPLES
@@ -60,17 +61,19 @@ init_service() {
 	local redirstd=
 	local clearpid=
 	local sourcefile=
+	local setuser=
 	local sv_name cmd runsv_dir svlog_dir sv_log sv_down sv_force options
 	dc_log 7 "Called with args $@"
 	OPTIND=1
-	while getopts ":dfhln:s:q" opts; do
+	while getopts ":dfhln:s:u:q" opts; do
 		case "${opts}" in
 			d) sv_down="down"; add_opt "down";;
 			f) sv_force="force"; add_opt "force";;
 			h) usage; exit;;
 			l) sv_log="log"; add_opt "log";;
 			n) sv_name="${OPTARG}"; add_opt "name";;
 			s) sourcefile=". ${OPTARG}"; add_opt "source";;
+			u) sv_user="${OPTARG}"; add_opt "user";;
 			q) redirstd="exec >/dev/null"; add_opt "quiet";;
 		esac
 	done
@@ -83,6 +86,9 @@ init_service() {
 	if [ -n "$sv_force" ]; then
 		forcepid="$(echo rm -f $(pid_name $sv_name)*)"
 	fi
+	if [ -n "$sv_user" ]; then
+		setuser="chpst -u $sv_name"
+	fi
 	shift
 	if [ ! -z "$cmd_path" ]; then
 		dc_log 5 "Setting up ($sv_name) options ($options) cmd ($cmd_path) args ($@)"
@@ -93,7 +99,7 @@ init_service() {
 			$forcepid
 			$redirstd
 			$sourcefile
-			exec $cmd_path $@
+			exec $setuser $cmd_path $@
 		!cat
 		chmod +x $runsv_dir/run
 		if [ -n "$sv_down" ]; then