aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislusf <chris.lu@gmail.com>2025-12-05 17:59:37 -0800
committerChris Lu <chrislusf@users.noreply.github.com>2025-12-06 18:53:22 -0800
commit8fa6d4e0d9b658e25f76093d892d1f96ce52e875 (patch)
tree7e3b93b8cf8bd61dd318a7c63b84d88d862b0b20
parent5286ea0818adf49dfe4c726bd2b411eded9d76fa (diff)
downloadseaweedfs-csi-driver-8fa6d4e0d9b658e25f76093d892d1f96ce52e875.tar.xz
seaweedfs-csi-driver-8fa6d4e0d9b658e25f76093d892d1f96ce52e875.zip
fix: use Go 1.23 and build from context instead of cloning master
-rw-r--r--cmd/seaweedfs-csi-driver/Dockerfile9
-rw-r--r--cmd/seaweedfs-mount/Dockerfile20
2 files changed, 17 insertions, 12 deletions
diff --git a/cmd/seaweedfs-csi-driver/Dockerfile b/cmd/seaweedfs-csi-driver/Dockerfile
index 81cb507..ba402d9 100644
--- a/cmd/seaweedfs-csi-driver/Dockerfile
+++ b/cmd/seaweedfs-csi-driver/Dockerfile
@@ -1,10 +1,11 @@
-FROM golang:1.24-alpine as builder
+FROM golang:1.23-alpine as builder
RUN apk add git g++
-RUN mkdir -p /go/src/github.com/seaweedfs/
-RUN git clone https://github.com/seaweedfs/seaweedfs-csi-driver /go/src/github.com/seaweedfs/seaweedfs-csi-driver
-RUN cd /go/src/github.com/seaweedfs/seaweedfs-csi-driver && go build -ldflags="-s -w" -o /seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go && go clean -cache -modcache
+WORKDIR /go/src/github.com/seaweedfs/seaweedfs-csi-driver
+COPY . .
+
+RUN go build -ldflags="-s -w" -o /seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go && go clean -cache -modcache
FROM alpine AS final
RUN apk add fuse
diff --git a/cmd/seaweedfs-mount/Dockerfile b/cmd/seaweedfs-mount/Dockerfile
index 55cdd76..9475175 100644
--- a/cmd/seaweedfs-mount/Dockerfile
+++ b/cmd/seaweedfs-mount/Dockerfile
@@ -1,19 +1,23 @@
-FROM golang:1.24-alpine AS builder
+FROM golang:1.23-alpine AS builder
+
RUN apk add git g++
+# Build weed binary
RUN mkdir -p /go/src/github.com/seaweedfs/
RUN git clone https://github.com/seaweedfs/seaweedfs /go/src/github.com/seaweedfs/seaweedfs
-RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed && go install
+RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed && go install && go clean -cache -modcache
-RUN mkdir -p /go/src/github.com/seaweedfs/
-RUN git clone https://github.com/seaweedfs/seaweedfs-csi-driver /go/src/github.com/seaweedfs/seaweedfs-csi-driver
-RUN cd /go/src/github.com/seaweedfs/seaweedfs-csi-driver && \
- go build -ldflags="-s -w" -o /seaweedfs-mount ./cmd/seaweedfs-mount/main.go
+# Build seaweedfs-mount from current context
+WORKDIR /go/src/github.com/seaweedfs/seaweedfs-csi-driver
+COPY . .
+
+RUN go build -ldflags="-s -w" -o /seaweedfs-mount ./cmd/seaweedfs-mount/main.go && go clean -cache -modcache
FROM alpine AS final
-RUN apk add fuse
+RUN apk add fuse
+LABEL author="Chris Lu"
COPY --from=builder /go/bin/weed /usr/bin/
COPY --from=builder /seaweedfs-mount /
RUN chmod +x /seaweedfs-mount
-ENTRYPOINT ["/seaweedfs-mount"] \ No newline at end of file
+ENTRYPOINT ["/seaweedfs-mount"]