From b6de7217133326efac9d06c2e0501e6c550f39d6 Mon Sep 17 00:00:00 2001 From: ace Date: Sat, 10 Jun 2023 08:04:31 +0300 Subject: [PATCH] fix --- build.yaml | 2 +- ddclient/Dockerfile | 9 ++++++--- ddclient/Makefile | 2 +- dovecot/Makefile | 2 +- faas-cli/Makefile | 2 +- haproxy/Makefile | 2 +- opendkim/Makefile | 2 +- opendmarc/Makefile | 2 +- playmaker/Makefile | 2 +- postfix/Makefile | 2 +- pwgen/Makefile | 2 +- rspamd/Makefile | 2 +- tsig/Makefile | 2 +- 13 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build.yaml b/build.yaml index b6d4203..8c7ab9f 100644 --- a/build.yaml +++ b/build.yaml @@ -18,5 +18,5 @@ chdir: "{{ item }}" target: "{{ target | default('all') }}" params: - REGISTRY: "{{ registry | default('git.geekhome.org/ghp') }}" + REGISTRY: "{{ registry | default('gitea.geekhome.org/ghp') }}" loop: "{{ dirs.files | map(attribute='path') | list }}" diff --git a/ddclient/Dockerfile b/ddclient/Dockerfile index 409d364..79e1269 100644 --- a/ddclient/Dockerfile +++ b/ddclient/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine:3.12 # set version label ARG BUILD_DATE @@ -7,8 +7,6 @@ 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 \ @@ -27,6 +25,11 @@ 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 eb9707e..ee5bfdb 100644 --- a/ddclient/Makefile +++ b/ddclient/Makefile @@ -1,7 +1,7 @@ VERSION=3.9.1 BUILD=1 IMAGE=ddclient -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/dovecot/Makefile b/dovecot/Makefile index 7ddcdd9..4fc6ff2 100644 --- a/dovecot/Makefile +++ b/dovecot/Makefile @@ -1,6 +1,6 @@ VERSION=2.3.16-1 IMAGE=dovecot -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/faas-cli/Makefile b/faas-cli/Makefile index 91b2329..2a6c587 100644 --- a/faas-cli/Makefile +++ b/faas-cli/Makefile @@ -1,6 +1,6 @@ VERSION=0.13.13 IMAGE=faas-cli -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/haproxy/Makefile b/haproxy/Makefile index 1f2e967..816a80a 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -1,6 +1,6 @@ VERSION=2.3.1 IMAGE=haproxy -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/opendkim/Makefile b/opendkim/Makefile index b3fb721..b0dcfc0 100644 --- a/opendkim/Makefile +++ b/opendkim/Makefile @@ -1,6 +1,6 @@ VERSION=2.11.0-1 IMAGE=opendkim -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/opendmarc/Makefile b/opendmarc/Makefile index c068fdb..db4b61c 100644 --- a/opendmarc/Makefile +++ b/opendmarc/Makefile @@ -1,6 +1,6 @@ VERSION=1.4.2-1 IMAGE=opendmarc -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/playmaker/Makefile b/playmaker/Makefile index 1c349fd..3aa94dc 100644 --- a/playmaker/Makefile +++ b/playmaker/Makefile @@ -1,6 +1,6 @@ VERSION=0.6.4 IMAGE=playmaker -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/postfix/Makefile b/postfix/Makefile index 72d1702..085bd2f 100644 --- a/postfix/Makefile +++ b/postfix/Makefile @@ -1,6 +1,6 @@ VERSION=3.5.8-1 IMAGE=postfix -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/pwgen/Makefile b/pwgen/Makefile index 5febac7..3023197 100644 --- a/pwgen/Makefile +++ b/pwgen/Makefile @@ -1,6 +1,6 @@ VERSION=latest IMAGE=pwgen -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/rspamd/Makefile b/rspamd/Makefile index bb6b6ec..2966909 100644 --- a/rspamd/Makefile +++ b/rspamd/Makefile @@ -1,6 +1,6 @@ VERSION=3.5-1 IMAGE=rspamd -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all diff --git a/tsig/Makefile b/tsig/Makefile index 7f62e4c..dac25b3 100644 --- a/tsig/Makefile +++ b/tsig/Makefile @@ -1,6 +1,6 @@ VERSION=latest IMAGE=tsig -REGISTRY=registry.0xace.cc/ghp +REGISTRY=gitea.geekhome.org/ghp .PHONY: build push all