[优化] DockerFile

This commit is contained in:
ryan
2026-06-01 09:34:17 +08:00
parent 330771e7c7
commit dfb3972b15
2 changed files with 9 additions and 22 deletions
+4 -11
View File
@@ -2,7 +2,7 @@ FROM golang:1.25-alpine AS builder
WORKDIR /build
COPY go.mod go.sum ./
COPY openflare_relay/go.mod openflare_relay/go.sum ./
# Note: In a real monorepo build, openflare and openflare_server need to be available.
# For now, we assume this is built from the root of the project where both are present.
COPY openflare_server /openflare_server
@@ -11,18 +11,11 @@ COPY openflare_relay /openflare_relay
WORKDIR /openflare_relay
RUN go build -o openflare-relay ./cmd/relay
FROM alpine:latest
# Install frps
RUN apk add --no-cache curl \
&& curl -fSL https://github.com/fatedier/frp/releases/download/v0.61.1/frp_0.61.1_linux_amd64.tar.gz -o frp.tar.gz \
&& tar -zxvf frp.tar.gz \
&& mv frp_0.61.1_linux_amd64/frps /usr/local/bin/ \
&& rm -rf frp_0.61.1_linux_amd64 frp.tar.gz \
&& chmod +x /usr/local/bin/frps
FROM fatedier/frps:v0.69.0
COPY --from=builder /openflare_relay/openflare-relay /usr/local/bin/openflare-relay
VOLUME ["/var/lib/openflare-relay"]
CMD ["openflare-relay", "-config", "/etc/openflare-relay/relay.json"]
ENTRYPOINT ["/usr/local/bin/openflare-relay", "-config", "/etc/openflare-relay/relay.json"]
CMD []
+5 -11
View File
@@ -1,8 +1,8 @@
FROM golang:1.24-alpine AS builder
FROM golang:1.25-alpine AS builder
WORKDIR /build
COPY go.mod go.sum ./
COPY openflared/go.mod openflared/go.sum ./
COPY openflare_server/go.mod openflare_server/go.sum ../openflare_server/
RUN go mod download
@@ -10,14 +10,7 @@ COPY openflare_server/ ../openflare_server/
COPY openflared/ .
RUN CGO_ENABLED=0 GOOS=linux go build -o flared ./cmd/flared
FROM alpine:latest
RUN apk --no-cache add ca-certificates tzdata curl && \
curl -L -o /tmp/frp.tar.gz https://github.com/fatedier/frp/releases/download/v0.58.0/frp_0.58.0_linux_amd64.tar.gz && \
tar -xzf /tmp/frp.tar.gz -C /tmp/ && \
mv /tmp/frp_0.58.0_linux_amd64/frpc /usr/bin/frpc && \
chmod +x /usr/bin/frpc && \
rm -rf /tmp/frp*
FROM fatedier/frpc:v0.69.0
WORKDIR /app
@@ -26,4 +19,5 @@ COPY --from=builder /build/flared .
ENV OPENFLARE_DATA_DIR=/app/data
ENV OPENFLARE_FRPC_PATH=/usr/bin/frpc
CMD ["./flared"]
ENTRYPOINT ["/app/flared"]
CMD []