From 48f7ae5ac249b0bee4dfc9c9c7dea9e3b9fb75db Mon Sep 17 00:00:00 2001 From: Calum MacRae Date: Mon, 12 Jul 2021 16:37:55 +0100 Subject: [PATCH 1/2] image: Provide a better built container image --- cmd/seaweedfs-csi-driver/Dockerfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/seaweedfs-csi-driver/Dockerfile b/cmd/seaweedfs-csi-driver/Dockerfile index 0e986db..7069d19 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile +++ b/cmd/seaweedfs-csi-driver/Dockerfile @@ -1,18 +1,18 @@ -FROM amd64/golang:1.16-alpine as builder -RUN apk add git go g++ +FROM frolvlad/alpine-glibc as builder +RUN apk add git go g++ curl jq -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 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 - -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 +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 From 8a82e63fe1095209c00ba41914892e76421b9f9a Mon Sep 17 00:00:00 2001 From: Calum MacRae Date: Mon, 12 Jul 2021 20:03:40 +0100 Subject: [PATCH 2/2] CI: Ensure Docker tags derived from refs include legal characters --- .github/workflows/release.yaml | 2 +- cmd/seaweedfs-csi-driver/Dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 2 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 7069d19..f83e3fa 100644 --- a/cmd/seaweedfs-csi-driver/Dockerfile +++ b/cmd/seaweedfs-csi-driver/Dockerfile @@ -1,6 +1,9 @@ -FROM frolvlad/alpine-glibc as builder +FROM amd64/golang:1.16-alpine as builder + RUN apk add git go g++ curl jq +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') \