[优化] 更新Dockerfile，优化构建过程

.dockerignore

@@ -1,5 +1,6 @@
 .git
 .idea
+.github
 anubis-source
 **/node_modules
 **/.next
@@ -9,3 +10,10 @@ anubis-source
 **/coverage
 **/*.db
 **/*.log
+tmp
+logs
+.DS_Store
+.env
+.env.*
+docker-compose*.yml
+

openflare_agent/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.7
 ARG VERSION=dev
 
 FROM golang:1.25-alpine AS builder
@@ -10,12 +11,20 @@ ENV CGO_ENABLED=0 \
     GOOS=${TARGETOS} \
     GOARCH=${TARGETARCH}
 
+WORKDIR /build
+COPY openflare_server/go.mod openflare_server/go.sum ./openflare_server/
+COPY openflare_agent/go.mod openflare_agent/go.sum ./openflare_agent/
+WORKDIR /build/openflare_agent
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
+
 WORKDIR /build
 COPY openflare_server ./openflare_server
 COPY openflare_agent ./openflare_agent
 WORKDIR /build/openflare_agent
-RUN go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
-RUN go build -trimpath -ldflags "-s -w -X 'openflare-agent/internal/config.Version=$VERSION'" -o /build/openflare-agent ./cmd/agent
+    --mount=type=cache,target=/root/.cache/go-build \
+    go build -trimpath -ldflags "-s -w -X 'openflare-agent/internal/config.Version=$VERSION'" -o /build/openflare-agent ./cmd/agent
 
 FROM openresty/openresty:alpine
 
@@ -32,3 +41,4 @@ COPY --from=builder /build/openflare-agent /usr/local/bin/openflare-agent
 EXPOSE 80 443 18081
 ENTRYPOINT ["/usr/local/bin/openflare-agent"]
 CMD ["-config", "/etc/openflare/agent.json"]
+

openflare_relay/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.7
 ARG VERSION=dev
 
 FROM golang:1.25-alpine AS builder
@@ -5,13 +6,19 @@ FROM golang:1.25-alpine AS builder
 ARG VERSION
 
 WORKDIR /build
+COPY openflare_server/go.mod openflare_server/go.sum /openflare_server/
+COPY openflare_relay/go.mod openflare_relay/go.sum /openflare_relay/
+WORKDIR /openflare_relay
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 
-COPY openflare_relay/go.mod openflare_relay/go.sum ./
+WORKDIR /build
 COPY openflare_server /openflare_server
 COPY openflare_relay /openflare_relay
-
 WORKDIR /openflare_relay
-RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w -X 'openflare-relay/internal/config.Version=$VERSION'" -o openflare-relay ./cmd/relay
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w -X 'openflare-relay/internal/config.Version=$VERSION'" -o openflare-relay ./cmd/relay
 
 # Final runtime image
 FROM fatedier/frps:v0.69.0
@@ -25,3 +32,4 @@ ENV OPENFLARE_FRPS_PATH=/usr/bin/frps
 ENV OPENFLARE_DATA_DIR=/var/lib/openflare-relay
 
 ENTRYPOINT ["/usr/local/bin/openflare-relay"]
+

openflare_server/.dockerignore

@@ -1,10 +1,16 @@
+.git
+.github
+node_modules
 web/node_modules
 web/.next
 web/build
 web/out
-
+dist
-upload
+tmp
 logs
-
+upload
-.git
+*.log
-.github
+.DS_Store
+.env
+.env.*
+docker-compose*.yml

openflare_server/Dockerfile

@@ -1,38 +1,38 @@
+# syntax=docker/dockerfile:1.7
 ARG VERSION=dev
-
+FROM node:20 AS web-builder
-FROM node:20 AS builder
-
 ARG VERSION
-
 WORKDIR /build
-COPY ./web/package.json ./
+RUN corepack enable
-COPY ./web/pnpm-lock.yaml ./
+COPY ./web/package.json ./web/pnpm-lock.yaml ./
-RUN corepack enable && pnpm install --frozen-lockfile
+RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
+    pnpm install --frozen-lockfile
 COPY ./web ./
-RUN NEXT_PUBLIC_APP_VERSION="$VERSION" pnpm build
+RUN --mount=type=cache,id=next-cache,target=/build/.next/cache \
-
+    NEXT_PUBLIC_APP_VERSION="$VERSION" pnpm build
-FROM golang:1.25 AS builder2
 
+FROM golang:1.25 AS go-builder
 ARG VERSION
-
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \
     GOOS=linux
-
 WORKDIR /build
+COPY go.mod go.sum ./
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 COPY . .
-COPY --from=builder /build/build ./web/build
+COPY --from=web-builder /build/build ./web/build
-RUN go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
-RUN go build -trimpath -ldflags "-s -w -X 'openflare/common.Version=$VERSION'" -o openflare
+    --mount=type=cache,target=/root/.cache/go-build \
+    go build -trimpath \
+      -ldflags "-s -w -X 'openflare/common.Version=$VERSION'" \
+      -o openflare
 
-FROM alpine
+FROM alpine:latest
-
+RUN apk add --no-cache ca-certificates tzdata \
-RUN apk update \
-    && apk upgrade \
-    && apk add --no-cache ca-certificates tzdata \
     && update-ca-certificates 2>/dev/null || true
 ENV PORT=3000
-COPY --from=builder2 /build/openflare /
+COPY --from=go-builder /build/openflare /openflare
 EXPOSE 3000
 WORKDIR /data
 ENTRYPOINT ["/openflare"]

openflared/Dockerfile

@@ -1,3 +1,4 @@
+# syntax=docker/dockerfile:1.7
 ARG VERSION=dev
 
 FROM golang:1.25-alpine AS builder
@@ -8,11 +9,14 @@ WORKDIR /build
 
 COPY openflared/go.mod openflared/go.sum ./
 COPY openflare_server/go.mod openflare_server/go.sum ../openflare_server/
-RUN go mod download
+RUN --mount=type=cache,target=/go/pkg/mod \
+    go mod download
 
 COPY openflare_server/ ../openflare_server/
 COPY openflared/ .
-RUN CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w -X 'openflare-flared/internal/config.Version=$VERSION'" -o flared ./cmd/flared
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    CGO_ENABLED=0 GOOS=linux go build -trimpath -ldflags "-s -w -X 'openflare-flared/internal/config.Version=$VERSION'" -o flared ./cmd/flared
 
 # Final runtime image
 FROM fatedier/frpc:v0.69.0
@@ -27,3 +31,4 @@ ENV OPENFLARE_FRPC_PATH=/usr/bin/frpc
 
 ENTRYPOINT ["/app/flared"]
 CMD []
+