Merge pull request #205 from hligit/multiarch-build

workflow: Build arm64 Docker images

Author: hligit

.github/workflows/docker-publish.yml

@@ -21,13 +21,17 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Set short sha variable
         id: vars
         run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
 
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME
-
       - name: Log into GitHub Container Registry
         # a PAT with `read:packages` and `write:packages` scopes is an Actions secret `CR_PAT`.
         # Doesn't support Org or Repo level PATs and no bot accounts
@@ -49,5 +53,10 @@ jobs:
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
 
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-          docker push $IMAGE_ID:$VERSION
+          for ARCH in amd64 arm64; do
+            docker buildx build -t $IMAGE_ID:$VERSION-$ARCH --platform=linux/${ARCH} --push .
+          done
+
+          docker manifest create $IMAGE_ID:$VERSION \
+            $(for ARCH in amd64 arm64; do echo $IMAGE_ID:$VERSION-$ARCH; done)
+          docker manifest push $IMAGE_ID:$VERSION

Dockerfile

@@ -1,11 +1,12 @@
-FROM golang:1.14 as builder
+FROM --platform=$BUILDPLATFORM golang:1.14 as builder
+ARG TARGETPLATFORM
 WORKDIR /go/src/github.com/atlassian/escalator/
-COPY go.mod go.sum ./
+COPY go.mod go.sum Makefile ./
 COPY cmd cmd
 COPY pkg pkg
-RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo cmd/main.go
+RUN make build
 
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
-COPY --from=builder /go/src/github.com/atlassian/escalator/main .
+COPY --from=builder /go/src/github.com/atlassian/escalator/escalator ./main
 CMD [ "./main" ]

Makefile

@@ -1,13 +1,12 @@
 .PHONY: build test test-vet docker clean lint
 
 TARGET=escalator
-# E.g. set this to -v (I.e. GOCMDOPTS=-v via shell) to get the go command to be verbose
-GOCMDOPTS?=
 SRC_DIRS=pkg cmd
 SOURCES=$(shell for dir in $(SRC_DIRS); do if [ -d $$dir ]; then find $$dir -type f -iname '*.go'; fi; done)
+ARCH=$(if $(TARGETPLATFORM),$(lastword $(subst /, ,$(TARGETPLATFORM))),amd64)
 
 $(TARGET): $(SOURCES)
-	go build $(GOCMDOPTS) -o $(TARGET) cmd/main.go
+	CGO_ENABLED=0 GOARCH=$(ARCH) go build -a -installsuffix cgo -o $(TARGET) cmd/main.go
 
 build: $(TARGET)
 
@@ -18,7 +17,7 @@ test-vet:
 	go vet ./...
 
 docker: Dockerfile
-	docker build -t atlassian/escalator .
+	docker buildx build -t atlassian/escalator --platform linux/$(ARCH) .
 
 clean:
 	rm -f $(TARGET)