update images

build.yaml

@@ -1,4 +1,5 @@
 - hosts: localhost
+  gather_facts: false
   connection: local
   tasks:
   - name: Find all dirs
@@ -17,5 +18,5 @@
       chdir: "{{ item }}"
       target: "{{ target | default('all') }}"
       params:
-        REGISTRY: "{{ registry | default('registry.0xace.cc/ghp') }}"
+        REGISTRY: "{{ registry | default('git.geekhome.org/ghp') }}"
     loop: "{{ dirs.files | map(attribute='path') | list }}"

ddclient/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.12
+FROM alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -7,6 +7,8 @@ ARG DDCLIENT_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="saarg"
 
+RUN apk add perl-app-cpanminus perl-data-validator perl-netaddr-ip perl-test-requires perl-json perl-test-fatal perl-try-tiny perl-test-without-module perl-test-warnings
+
 RUN \
  echo "**** install build packages ****" && \
  apk add --no-cache --virtual=build-dependencies \
@@ -25,11 +27,6 @@ RUN \
 	perl-io-socket-inet6 \
 	perl-io-socket-ssl \
 	perl-json && \
- echo "***** install perl modules ****" && \
- curl -L http://cpanmin.us | perl - App::cpanminus && \
- cpanm \
-	Data::Validate::IP \
-	JSON::Any && \
  echo "**** install nsupdate for RFC2136 ****" && \
  apk add --no-cache \
   bind-tools && \

ddclient/Makefile

@@ -1,13 +1,14 @@
-VERSION=v3.9.1-ls45
+VERSION=3.9.1
+BUILD=1
 IMAGE=ddclient
 REGISTRY=registry.0xace.cc/ghp
 
 .PHONY: build push all
 
 build:
-	docker build -t $(REGISTRY)/$(IMAGE):$(VERSION) .
+	docker build --build-arg="DDCLIENT_VERSION=v$(VERSION)" -t $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD) .
 
 push:
-	docker push $(REGISTRY)/$(IMAGE):$(VERSION)
+	docker push $(REGISTRY)/$(IMAGE):$(VERSION)-$(BUILD)
 
 all: build push

dovecot/Dockerfile

@@ -7,7 +7,7 @@ RUN dnf install -y epel-release && dnf update -y \
   && rm -rf /var/cache/yum
 
 RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.1.1 \
+  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum

opendkim/Dockerfile

@@ -7,7 +7,7 @@ RUN dnf install -y epel-release && dnf update -y \
   && rm -rf /var/cache/yum
 
 RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.1.1 \
+  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum

opendmarc/Dockerfile

@@ -7,7 +7,7 @@ RUN dnf install -y epel-release && dnf update -y \
   && rm -rf /var/cache/yum
 
 RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.1.1 \
+  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum

opendmarc/Makefile

@@ -1,4 +1,4 @@
-VERSION=1.4.1.1-1
+VERSION=1.4.2-1
 IMAGE=opendmarc
 REGISTRY=registry.0xace.cc/ghp
 

postfix/Dockerfile

@@ -7,7 +7,7 @@ RUN dnf install -y epel-release && dnf update -y \
   && rm -rf /var/cache/yum
 
 RUN dnf install -y postfix-3.5.8 postfix-ldap-3.5.8 postfix-mysql-3.5.8 postfix-pgsql-3.5.8 \
-  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.1.1 \
+  dovecot-2.3.16 dovecot-pigeonhole-2.3.16 opendkim-2.11.0 opendmarc-1.4.2 \
   cyrus-sasl cyrus-sasl-plain cyrus-sasl-md5 pypolicyd-spf \
   && dnf clean all \
   && rm -rf /var/cache/yum

pwgen/Dockerfile

@@ -1,9 +1,10 @@
-FROM golang:1.15 as builder
+FROM golang:1.20 as builder
-COPY vapid.go /vapid.go
+COPY vapid.go /opt/vapid.go
-RUN go get -u github.com/SherClockHolmes/webpush-go
+WORKDIR /opt
-RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o /vapid /vapid.go
+RUN go mod init vapid.go && go mod tidy
+RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o /vapid /opt/vapid.go
 
-FROM alpine:3.12
+FROM alpine:3.18
 
 RUN apk add --no-cache openldap-passwd-pbkdf2 apache2-utils pwgen opendkim-utils coreutils
 COPY dkim-key.sh /dkim-key.sh