From 6d83edd84de50db97a536f214c726f9aa67cd870 Mon Sep 17 00:00:00 2001 From: ace Date: Sat, 10 Jun 2023 06:20:50 +0300 Subject: [PATCH] update images --- build.yaml | 3 ++- ddclient/Dockerfile | 9 +++------ ddclient/Makefile | 7 ++++--- dovecot/Dockerfile | 2 +- opendkim/Dockerfile | 2 +- opendmarc/Dockerfile | 2 +- opendmarc/Makefile | 2 +- postfix/Dockerfile | 2 +- pwgen/Dockerfile | 11 ++++++----- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build.yaml b/build.yaml index 0d15142..b6d4203 100644 --- a/build.yaml +++ b/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 }}" diff --git a/ddclient/Dockerfile b/ddclient/Dockerfile index 5d3ce86..409d364 100644 --- a/ddclient/Dockerfile +++ b/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 && \ diff --git a/ddclient/Makefile b/ddclient/Makefile index 4cd7886..eb9707e 100644 --- a/ddclient/Makefile +++ b/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 diff --git a/dovecot/Dockerfile b/dovecot/Dockerfile index 4afaa22..62960aa 100644 --- a/dovecot/Dockerfile +++ b/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 diff --git a/opendkim/Dockerfile b/opendkim/Dockerfile index b7993c2..7a7f752 100644 --- a/opendkim/Dockerfile +++ b/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 diff --git a/opendmarc/Dockerfile b/opendmarc/Dockerfile index 3e9dfac..4ff6493 100644 --- a/opendmarc/Dockerfile +++ b/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 diff --git a/opendmarc/Makefile b/opendmarc/Makefile index c057a49..c068fdb 100644 --- a/opendmarc/Makefile +++ b/opendmarc/Makefile @@ -1,4 +1,4 @@ -VERSION=1.4.1.1-1 +VERSION=1.4.2-1 IMAGE=opendmarc REGISTRY=registry.0xace.cc/ghp diff --git a/postfix/Dockerfile b/postfix/Dockerfile index c3293d5..c069a83 100644 --- a/postfix/Dockerfile +++ b/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 diff --git a/pwgen/Dockerfile b/pwgen/Dockerfile index f0689a6..2e6d213 100644 --- a/pwgen/Dockerfile +++ b/pwgen/Dockerfile @@ -1,9 +1,10 @@ -FROM golang:1.15 as builder -COPY vapid.go /vapid.go -RUN go get -u github.com/SherClockHolmes/webpush-go -RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o /vapid /vapid.go +FROM golang:1.20 as builder +COPY vapid.go /opt/vapid.go +WORKDIR /opt +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