- [build](Makefile) Now use alpine:3.20 (asterisk:20.8.1).

- [build](Dockerfile) Switch to php83. - [demo](demo) Fixed target 'apk_list'.
mlan · Jun 4, 2024 · 1229954 · 1229954
1 parent db29412
commit 1229954
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.1.9
+
+- [build](Makefile) Now use alpine:3.20 (asterisk:20.8.1).
+- [build](Dockerfile) Switch to php83.
+- [demo](demo) Fixed target 'apk_list'.
+
 # 1.1.8
 
 - [build](Makefile) Due to changed behavior with docker 26, files are now copied on the host instead of being hard-linked.

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@
 
 -include    *.mk
 
-BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.19 --build-arg PHP_VER=php82
+BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.20 --build-arg PHP_VER=php83
 BLD_REPO ?= mlan/asterisk
 BLD_VER  ?= latest
 BLD_TGT  ?= full

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ git clone https://github.com/mlan/docker-asterisk.git
 An example of how to configure an VoIP SIP server using docker compose is given below.
 
 ```yaml
-version: '3'
+name: demo
 
 services:
   tele:

diff --git a/demo/Makefile b/demo/Makefile
@@ -105,7 +105,7 @@ restart_%:
 	docker compose exec $(SRV_NAME) sv restart $*
 
 apk_list:
-	docker compose exec $(SRV_NAME) /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s  %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort'
+	docker compose exec $(SRV_NAME) /bin/sh -c 'apk info -sq $$(apk info -q) | sed -r "N;N;s/([^ ]+) installed size:\n([^ ]+) (.).*/\2\3\t\1/" | sort -h'
 
 apk_add_%:
 	docker compose exec $(SRV_NAME) apk -q --no-cache --update add $*