diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2021-07-12 14:25:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 14:25:06 -0700 |
| commit | e31e48303762c50c70a8bf09069d73c5206343d5 (patch) | |
| tree | 407edc73c1f15ee92204893d5da7b2a22e0a2268 | |
| parent | cfe0766a422b5d8a6b80cb75a6a32253cc648515 (diff) | |
| parent | 8a82e63fe1095209c00ba41914892e76421b9f9a (diff) | |
| download | seaweedfs-csi-driver-e31e48303762c50c70a8bf09069d73c5206343d5.tar.xz seaweedfs-csi-driver-e31e48303762c50c70a8bf09069d73c5206343d5.zip | |
Merge pull request #28 from cmacrae/better_docker_image
image: Provide a better built container image
| -rw-r--r-- | .github/workflows/release.yaml | 2 | ||||
| -rw-r--r-- | cmd/seaweedfs-csi-driver/Dockerfile | 19 |
2 files changed, 12 insertions, 9 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d8b9f0e..087f461 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -35,7 +35,7 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - name: Get the current tag name - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV + run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" | sed 's/\//_/g' >> $GITHUB_ENV - name: Setup QEMU uses: docker/setup-qemu-action@v1 diff --git a/cmd/seaweedfs-csi-driver/Dockerfile b/cmd/seaweedfs-csi-driver/Dockerfile index 0e986db..f83e3fa 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile +++ b/cmd/seaweedfs-csi-driver/Dockerfile @@ -1,18 +1,21 @@ FROM amd64/golang:1.16-alpine as builder -RUN apk add git go g++ -RUN mkdir -p /go/src/github.com/chrislusf/ -RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs -RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install +RUN apk add git go g++ curl jq -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 +WORKDIR / + +RUN curl -sL \ + $(curl -s https://api.github.com/repos/chrislusf/seaweedfs/releases/latest \ + | jq -r '.assets[]|select(.name=="linux_amd64.tar.gz")|.browser_download_url') \ + | tar xzvf - + +COPY ../../ /src +RUN cd /src && go build -o /seaweedfs-csi-driver ./cmd/seaweedfs-csi-driver/main.go FROM alpine AS final RUN apk add fuse LABEL author="Chris Lu" -COPY --from=builder /go/bin/weed /usr/bin/ +COPY --from=builder /weed /usr/bin/ COPY --from=builder /seaweedfs-csi-driver / RUN chmod +x /seaweedfs-csi-driver |