diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:15 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:15 -0700 |
| commit | 82ab464ce0afb19ceafddbade6fcaaec433ffc0f (patch) | |
| tree | 127125e98b3b6de6aaccd26e842f15ab7a3a4fa6 | |
| parent | f29462754aedfd3c590675cbd09d77a41f566fad (diff) | |
| download | seaweedfs-csi-driver-82ab464ce0afb19ceafddbade6fcaaec433ffc0f.tar.xz seaweedfs-csi-driver-82ab464ce0afb19ceafddbade6fcaaec433ffc0f.zip | |
Revert "Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs""
This reverts commit 8cb42c39
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cmd/seaweedfs-csi-driver/Dockerfile | 2 | ||||
| -rw-r--r-- | pkg/driver/mounter_seaweedfs.go | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -6,7 +6,7 @@ IMAGE_NAME=seaweedfs-csi-driver VERSION ?= dev IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(VERSION) COMMIT ?= $(shell git rev-parse --short HEAD) -LDFLAGS ?= -X github.com/seaweedfs/seaweedfs-csi-driver/pkg/driver.gitCommit=${COMMIT} +LDFLAGS ?= -s -w -X github.com/seaweedfs/seaweedfs-csi-driver/pkg/driver.gitCommit=${COMMIT} build: CGO_ENABLED=0 GOOS=linux go build -a -ldflags '$(LDFLAGS)' -o _output/seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go diff --git a/cmd/seaweedfs-csi-driver/Dockerfile b/cmd/seaweedfs-csi-driver/Dockerfile index 0a44fe9..736c34a 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile +++ b/cmd/seaweedfs-csi-driver/Dockerfile @@ -10,7 +10,7 @@ RUN cd /go/src/github.com/seaweedfs/seaweedfs/weed && go install 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 -o /seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go +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 FROM alpine AS final RUN apk add fuse diff --git a/pkg/driver/mounter_seaweedfs.go b/pkg/driver/mounter_seaweedfs.go index 5072b49..8f4ab9e 100644 --- a/pkg/driver/mounter_seaweedfs.go +++ b/pkg/driver/mounter_seaweedfs.go @@ -50,7 +50,7 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) (Unmounter, error) { filers = append(filers, string(address)) } - // CacheDir should be always defined - we use temp dir in case it is not defined + // CacheDirForRead should be always defined - we use temp dir in case it is not defined // we need to use predictable cache path, because we need to clean it up on unstage cacheDir := filepath.Join(seaweedFs.driver.CacheDir, seaweedFs.volumeID) |