From a0af02f883de7d3b8d16967f78c6e088f719622d Mon Sep 17 00:00:00 2001 From: upbeat-backbone-bose Date: Thu, 6 Aug 2026 17:39:57 +0800 Subject: [PATCH 1/2] chore(build): align Go toolchain versions --- .github/workflows/go.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 85287ce..59d568b 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.24' + go-version-file: 'go.mod' - name: Build run: go build -v -ldflags="-s -w" -trimpath -tags="malloc_syscall" ./... diff --git a/Dockerfile b/Dockerfile index 7ff6f68..85f8385 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.18-alpine AS builder +FROM golang:1.25.1-alpine AS builder RUN set -e \ && apk upgrade \ @@ -56,4 +56,4 @@ EXPOSE 2019 WORKDIR /srv -CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] \ No newline at end of file +CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"] From 306e4d3df4d0425eddf54dd1b221a249f11c30a4 Mon Sep 17 00:00:00 2001 From: upbeat-backbone-bose Date: Thu, 6 Aug 2026 18:06:21 +0800 Subject: [PATCH 2/2] fix(docker): restore image build compatibility --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 85f8385..6375a7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN set -e \ --with github.com/caddy-dns/cloudflare \ --with github.com/caddy-dns/alidns \ --with github.com/caddy-dns/vultr \ - --with github.com/caddy-dns/dnspod \ + --with github.com/caddy-dns/dnspod@fb7cc31cc04c \ --with github.com/caddy-dns/duckdns \ --with github.com/caddy-dns/gandi \ --with github.com/hairyhenderson/caddy-teapot-module \ @@ -26,10 +26,10 @@ FROM alpine AS dist LABEL maintainer="mritd " # See https://caddyserver.com/docs/conventions#file-locations for details -ENV XDG_CONFIG_HOME /config -ENV XDG_DATA_HOME /data +ENV XDG_CONFIG_HOME=/config +ENV XDG_DATA_HOME=/data -ENV TZ Asia/Shanghai +ENV TZ=Asia/Shanghai COPY --from=builder /caddy /usr/bin/caddy ADD https://raw.githubusercontent.com/caddyserver/dist/master/config/Caddyfile /etc/caddy/Caddyfile @@ -38,7 +38,7 @@ ADD https://raw.githubusercontent.com/caddyserver/dist/master/welcome/index.html # set up nsswitch.conf for Go's "netgo" implementation # - https://github.com/golang/go/blob/go1.9.1/src/net/conf.go#L194-L275 # - docker run --rm debian:stretch grep '^hosts:' /etc/nsswitch.conf -RUN [ ! -e /etc/nsswitch.conf ] && echo 'hosts: files dns' > /etc/nsswitch.conf +RUN if [ ! -e /etc/nsswitch.conf ]; then echo 'hosts: files dns' > /etc/nsswitch.conf; fi RUN set -e \ && apk upgrade \