Skip to content

Commit

Permalink
- [docker](Makefile) Use alpine:3.20 (postfix:3.9.0 dovecot:2.3.21).
Browse files Browse the repository at this point in the history
- [github](.github/workflows/testimage.yml) Now use Node.js 20 `actions/checkout@v4`.
- [demo](demo) Fixed target `*-apk_list`.
  • Loading branch information
mlan committed Jun 5, 2024
1 parent e81de7d commit b9ae62f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions demo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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,%,$@))

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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))

Expand Down

0 comments on commit b9ae62f

Please sign in to comment.