- [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.
- [docker](src/docker) Improve debug message in [docker-service.sh](src/docker/bin/docker-service.sh).

Author: mlan

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.1.7
+
+- [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.
+- [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).

Dockerfile

@@ -1,5 +1,5 @@
-ARG	DIST=alpine
-ARG	REL=latest
+ARG 	DIST=alpine
+ARG 	REL=latest
 
 
 #
@@ -11,14 +11,16 @@ ARG	REL=latest
 #
 
 FROM	$DIST:$REL AS mini
+ARG 	PHP_VER=php82
 LABEL	maintainer=mlan
 
-ENV	SVDIR=/etc/service \
+ENV	PHP_VER=$PHP_VER \
+	SVDIR=/etc/service \
 	DOCKER_PERSIST_DIR=/srv \
 	DOCKER_BIN_DIR=/usr/local/bin \
 	DOCKER_ENTRY_DIR=/etc/docker/entry.d \
 	DOCKER_EXIT_DIR=/etc/docker/exit.d \
-	DOCKER_PHP_DIR=/usr/share/php81 \
+	DOCKER_PHP_DIR=/usr/share/$PHP_VER \
 	DOCKER_SPOOL_DIR=/var/spool/asterisk \
 	DOCKER_CONF_DIR=/etc/asterisk \
 	DOCKER_LOG_DIR=/var/log/asterisk \
@@ -62,6 +64,8 @@ RUN	source docker-common.sh \
 	$DOCKER_NFT_DIR \
 	$DOCKER_SPOOL_DIR \
 	&& mkdir -p $DOCKER_ACME_SSL_DIR \
+	&& ln -sf $DOCKER_PHP_DIR/autoban.php $DOCKER_BIN_DIR/autoban \
+	&& ln -sf $DOCKER_PHP_DIR/websms.php $DOCKER_BIN_DIR/websms \
 	&& apk --no-cache --update add \
 	asterisk
 
@@ -93,13 +97,14 @@ RUN	apk --no-cache --update add \
 	asterisk-srtp \
 	openssl \
 	curl \
-	php81 \
-	php81-curl \
-	php81-json \
+	$PHP_VER \
+	$PHP_VER-curl \
+	$PHP_VER-json \
 	runit \
 	bash \
 	nftables \
 	jq \
+	&& ln -sf /usr/bin/$PHP_VER /usr/bin/php \
 	&& docker-service.sh \
 	"syslogd -nO- -l$SYSLOG_LEVEL $SYSLOG_OPTIONS" \
 	"crond -f -c /etc/crontabs" \

Makefile

@@ -13,7 +13,7 @@ BLD_TGTS ?= mini base full xtra
 BLD_CMT  ?= HEAD
 BLD_CVER ?= ast160
 BLD_DNLD ?= curl -o
-BLD_KIT  ?= DOCKER_BUILDKIT=0
+BLD_KIT  ?= DOCKER_BUILDKIT=1
 
 TST_REPO ?= $(BLD_REPO)
 TST_VER  ?= $(BLD_VER)
@@ -79,7 +79,7 @@ prune:
 	docker image prune -f
 
 clean:
-	docker images | grep $(BLD_REPO) | awk '{print $$1 ":" $$2}' | uniq | xargs docker rmi
+	docker images | grep $(BLD_REPO) | awk '{print $$1 ":" $$2}' | uniq | xargs docker rmi || true
 
 $(TST_TGTE):
 	${MAKE} $(TST_ENV) $@

demo/Makefile

@@ -116,10 +116,11 @@ tools_install:
 	pulseaudio-utils alsa-utils
 
 xdebug_install:
+	$(eval PHP_VER=$(shell docker compose exec $(SRV_NAME) sh -c 'echo $$PHP_VER'))
 	docker compose exec $(SRV_NAME) apk --no-cache --update add \
-	php8-pecl-xdebug
-	docker compose exec $(SRV_NAME) sed -i '1 a xdebug.profiler_enable = 1' /etc/php81/php.ini
-	docker compose exec $(SRV_NAME) sed -i '2 a zend_extension=xdebug.so' /etc/php81/conf.d/50_xdebug.ini
+	$(PHP_VER)-pecl-xdebug
+	docker compose exec $(SRV_NAME) sed -i '1 a xdebug.profiler_enable = 1' /etc/$(PHP_VER)/php.ini
+	docker compose exec $(SRV_NAME) sed -i '2 a zend_extension=xdebug.so' /etc/$(PHP_VER)/conf.d/50_xdebug.ini
 	docker compose exec $(SRV_NAME) sv restart websmsd autoband
 
 xdebug_getdata:

dkr.mk

@@ -28,6 +28,11 @@ dkr_cnt_pid  = $(shell docker inspect --format '{{.State.Pid}}' $(1))
 #	'{{range .NetworkSettings.Networks}}{{println .IPAddress}}{{end}}' \
 #	$(1) | head -n1)
 
+#
+# $(call dkr_img_env,image,envvar) -> value
+#
+dkr_img_env  = $(shell docker inspect -f \
+	'{{range .Config.Env}}{{println .}}{{end}}' $(1) | grep -P "^$(2)=" | sed 's/[^=]*=//'
 #
 # List IPs of containers
 #

src/autoban/bin/autoban

@@ -75,24 +75,25 @@ init_service() {
 		esac
 	done
 	shift $((OPTIND -1))
-	cmd=$(which "$1")
-	sv_name=${sv_name-$(base_name $1)}
+	cmd=$1
+	cmd_path=$(which "$cmd")
+	sv_name=${sv_name-$(base_name $cmd)}
 	runsv_dir=$SVDIR/$sv_name
 	svlog_dir=$DOCKER_SVLOG_DIR/$sv_name
 	if [ -n "$sv_force" ]; then
 		forcepid="$(echo rm -f $(pid_name $sv_name)*)"
 	fi
 	shift
-	if [ ! -z "$cmd" ]; then
-		dc_log 5 "Setting up ($sv_name) options ($options) args ($@)"
+	if [ ! -z "$cmd_path" ]; then
+		dc_log 5 "Setting up ($sv_name) options ($options) cmd ($cmd_path) args ($@)"
 		mkdir -p $runsv_dir
 		cat <<-!cat > $runsv_dir/run
 			#!/bin/sh -e
 			exec 2>&1
 			$forcepid
 			$redirstd
 			$sourcefile
-			exec $cmd $@
+			exec $cmd_path $@
 		!cat
 		chmod +x $runsv_dir/run
 		if [ -n "$sv_down" ]; then
@@ -107,14 +108,14 @@ init_service() {
 			chmod +x $runsv_dir/log/run
 		fi
 	else
-		dc_log 4 "Cannot find command."
+		dc_log 4 "Cannot find command: $cmd"
 	fi
 	}
 
 #
 # run
 #
 
-for cmd in "$@" ; do
-	init_service $cmd
+for args in "$@" ; do
+	init_service $args
 done

src/docker/bin/docker-service.sh

@@ -115,7 +115,7 @@ test-logs_%:
 	docker container logs $(PBX_NAME) | grep 'docker-entrypoint.sh' || true
 
 test-wait_%:
-	case $* in [1-3]) sleep $(TST_W8S);; [4-9]) sleep $(TST_W8L);; esac
+	case $* in [1-2]) sleep $(TST_W8S);; [3-9]) sleep $(TST_W8L);; esac
 
 test-up-net:
 	docker network create $(NET_NAME) 2>/dev/null || true