Releasing docker image for arm64: Incorporate review comment

Signed-off-by: odidev <[email protected]>

Author: odidev

.github/workflows/tag.yml

@@ -17,6 +17,15 @@ jobs:
           go-version: 1.15
       - name: Unshallow
         run: git fetch --prune --unshallow
+      - name: Login do docker.io
+        run: docker login -u golangci -p ${{ secrets.GOLANGCI_LINT_DOCKER_TOKEN }}
+      - name: Create release
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: release --rm-dist
+        env:
+          GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}
       - name: Prepare
         id: prepare
         run: |
@@ -28,15 +37,6 @@ jobs:
         uses: docker/setup-qemu-action@v1
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-      - name: Login do docker.io
-        run: docker login -u golangci -p ${{ secrets.GOLANGCI_LINT_DOCKER_TOKEN }}
-      - name: Create release
-        uses: goreleaser/goreleaser-action@v2
-        with:
-          version: latest
-          args: release --rm-dist
-        env:
-          GITHUB_TOKEN: ${{ secrets.GOLANGCI_LINT_TOKEN }}
       - name: build and publish main image
         id: docker_build
         uses: docker/build-push-action@v2

build/Dockerfile

@@ -1,12 +1,12 @@
 # stage 1 building the code
 FROM golang:1.15 as builder
 
-# don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume
-RUN git clone https://github.com/golangci/golangci-lint
-WORKDIR golangci-lint
-RUN go build -o /usr/bin/golangci-lint ./cmd/golangci-lint/main.go
+COPY / /golangci
+WORKDIR /golangci
+RUN go build -o golangci-lint ./cmd/golangci-lint/main.go
 
 # stage 2
 FROM golang:1.15
-COPY --from=builder /usr/bin/golangci-lint /usr/bin/
+# don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume
+COPY --from=builder /golangci/golangci-lint /usr/bin/
 CMD ["golangci-lint"]

build/Dockerfile.alpine

@@ -1,18 +1,16 @@
 # stage 1 building the code
 FROM golang:1.15-alpine as builder
 
+COPY / /golangci
+WORKDIR /golangci
+RUN CGO_ENABLED=0 go build -o golangci-lint ./cmd/golangci-lint/main.go
+
+# stage 2
+FROM golang:1.15-alpine
 # gcc is required to support cgo;
 # git and mercurial are needed most times for go get`, etc.
 # See https://github.com/docker-library/golang/issues/80
 RUN apk --no-cache add gcc musl-dev git mercurial
-
 # don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume
-RUN git clone https://github.com/golangci/golangci-lint
-WORKDIR golangci-lint
-RUN CGO_ENABLED=0 go build -o /usr/bin/golangci-lint ./cmd/golangci-lint/main.go
-
-# stage 2
-FROM golang:1.15-alpine
-RUN apk --no-cache add gcc musl-dev git mercurial
-COPY --from=builder /usr/bin/golangci-lint /usr/bin/
+COPY --from=builder /golangci/golangci-lint /usr/bin/
 CMD ["golangci-lint"]