From fb24b64c83d273bc14d10ffc7475afc9a59b25a5 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 7 Jun 2020 14:28:17 -0700 Subject: [PATCH] dev prod dockerfilee --- Makefile | 2 +- cmd/seaweedfs-csi-driver/Dockerfile | 4 +--- cmd/seaweedfs-csi-driver/Dockerfile.dev | 9 +++++++++ 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 cmd/seaweedfs-csi-driver/Dockerfile.dev diff --git a/Makefile b/Makefile index 92ce524..6d6097e 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ LDFLAGS ?= -X github.com/seaweedfs/seaweedfs-csi-driver/pkg/driver.gitCommit=${C build: CGO_ENABLED=0 GOOS=linux go build -a -ldflags '$(LDFLAGS)' -o _output/seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go container: build - docker build -t $(IMAGE_TAG) -f cmd/seaweedfs-csi-driver/Dockerfile . + docker build -t $(IMAGE_TAG) -f cmd/seaweedfs-csi-driver/Dockerfile.dev . push: container docker push $(IMAGE_TAG) clean: diff --git a/cmd/seaweedfs-csi-driver/Dockerfile b/cmd/seaweedfs-csi-driver/Dockerfile index 0f882fd..678fdfd 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile +++ b/cmd/seaweedfs-csi-driver/Dockerfile @@ -7,9 +7,7 @@ RUN cd /go/src/github.com/chrislusf/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 && make build - -COPY ./_output/seaweedfs-csi-driver /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 FROM alpine AS final LABEL author="Chris Lu" diff --git a/cmd/seaweedfs-csi-driver/Dockerfile.dev b/cmd/seaweedfs-csi-driver/Dockerfile.dev new file mode 100644 index 0000000..641c5ad --- /dev/null +++ b/cmd/seaweedfs-csi-driver/Dockerfile.dev @@ -0,0 +1,9 @@ +FROM chrislusf/seaweedfs as builder + +FROM alpine AS final +LABEL author="Chris Lu" +COPY --from=builder /usr/bin/weed /usr/bin/ +COPY ./_output/seaweedfs-csi-driver /seaweedfs-csi-driver + +RUN chmod +x /seaweedfs-csi-driver +ENTRYPOINT ["/seaweedfs-csi-driver"]