From b9ae62f9f1905fdf9a4a123164c0343f6051fca2 Mon Sep 17 00:00:00 2001
From: mlan <mlan@circuit-factory.com>
Date: Wed, 5 Jun 2024 12:36:20 +0200
Subject: [PATCH] - [docker](Makefile) Use alpine:3.20 (postfix:3.9.0
 dovecot:2.3.21). - [github](.github/workflows/testimage.yml) Now use Node.js
 20 `actions/checkout@v4`. - [demo](demo) Fixed target `*-apk_list`.

---
 .github/workflows/testimage.yml | 2 +-
 CHANGELOG.md                    | 6 ++++++
 Makefile                        | 2 +-
 demo/Makefile                   | 9 +++------
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/testimage.yml b/.github/workflows/testimage.yml
index 3dcefaa..9da85cc 100644
--- a/.github/workflows/testimage.yml
+++ b/.github/workflows/testimage.yml
@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install dependencies
       run: sudo apt-get install -y ldap-utils
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13f554b..89b49e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.0.5
+
+- [docker](Makefile) Use alpine:3.20 (postfix:3.9.0 dovecot:2.3.21).
+- [github](.github/workflows/testimage.yml) Now use Node.js 20 `actions/checkout@v4`.
+- [demo](demo) Fixed target `*-apk_list`.
+
 # 1.0.4
 
 - [docker](Makefile) Use alpine:3.19 (postfix:3.8.6 dovecot:2.3.21).
diff --git a/Makefile b/Makefile
index 6430c60..60e4d18 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@
 
 -include    *.mk
 
-BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.19
+BLD_ARG  ?= --build-arg DIST=alpine --build-arg REL=3.20
 BLD_REPO ?= mlan/postfix
 BLD_VER  ?= latest
 BLD_TGT  ?= full
diff --git a/demo/Makefile b/demo/Makefile
index dc49e2b..27c2b30 100644
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -103,6 +103,9 @@ $(addsuffix -env,$(SRV_LIST)):
 $(addsuffix -sv,$(SRV_LIST)):
 	docker compose exec $(patsubst %-sv,%,$@) sh -c 'sv status $$SVDIR/*'
 
+$(addsuffix -apk_list,$(SRV_LIST)):
+	docker compose exec $(patsubst %-apk_list,%,$@) sh -c 'apk info -sq $$(apk info -q) | sed -r "N;N;s/([^ ]+) installed size:\n([^ ]+) (.).*/\2\3\t\1/" | sort -h'
+
 $(addsuffix -diff,$(SRV_LIST)):
 	docker container diff $(call dkr_srv_cnt,$(patsubst %-diff,%,$@))
 
@@ -332,9 +335,6 @@ mta-tools:
 	docker compose exec mta apk --no-cache --update add \
 	nano less lsof htop openldap-clients bind-tools iputils strace iproute2
 
-mta-apk_list:
-	docker compose exec mta /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s %3s %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort | sort -k 2,2'
-
 mta-htop: mta-tools
 	docker compose exec mta htop
 
@@ -381,9 +381,6 @@ flt-man:
 	docker compose exec flt apk --no-cache --update add \
 	man-db man-pages apk-tools-doc clamav-doc rspamd-doc
 
-flt-apk_list:
-	docker compose exec flt /bin/sh -c 'for pkg in $$(apk info 2>/dev/null); do printf "%9s %3s %s\n" $$(apk info -s $$pkg 2>/dev/null | sed -n "2{p;q}") $$pkg; done | sort | sort -k 2,2'
-
 flt-web:
 	$(call webb_cmd,http://$(FLT_FQDN))