Skip to content

Chore/align go toolchain version and fix(docker): restore image build compatibility #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
upbeat-backbone-bose wants to merge 4 commits into from
Closed

Chore/align go toolchain version and fix(docker): restore image build compatibility #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8b7310
Merge pull request #1 from upbeat-backbone-bose/security/cve-remediat…
upbeat-backbone-bose Aug 5, 2026
aac2a38
Merge branch 'imgk:main' into main
upbeat-backbone-bose Aug 6, 2026
a0af02f
chore(build): align Go toolchain versions
upbeat-backbone-bose Aug 6, 2026
306e4d3
fix(docker): restore image build compatibility
upbeat-backbone-bose Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ./...
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.18-alpine AS builder
FROM golang:1.25.1-alpine AS builder

RUN set -e \
&& apk upgrade \
Expand All @@ -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 \
Expand All @@ -26,10 +26,10 @@ FROM alpine AS dist
LABEL maintainer="mritd <mritd@linux.com>"

# 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
Expand All @@ -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 \
Expand All @@ -56,4 +56,4 @@ EXPOSE 2019

WORKDIR /srv

CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
CMD ["caddy", "run", "--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
Loading