Multiarch Docker build and publish

Author: mattolenik

.github/workflows/release.yml

@@ -15,28 +15,41 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
+
       - name: Get release version
         id: get_version
         run: echo ::set-env name=RELEASE_VERSION::$(echo ${GITHUB_REF:10})
+
       - name: Checkout code
         uses: actions/checkout@v2
+
       - name: Get CloudFlare Token
         run: echo ::set-env name=CLOUDFLARE_TOKEN::${{ secrets.CLOUDFLARE_TOKEN }}
+
       - name: Get Test Domain Name
         run: echo ::set-env name=TEST_DOMAIN::${{ secrets.TEST_DOMAIN }}
+
       - name: Test and Build
         run: make test all shasums
+
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: dist/cloudflare-ddns-*
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # https://github.com/docker/setup-qemu-action
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to Docker Hub
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
+
       - name: Publish to Docker Hub
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: ${{ secrets.DOCKER_USERNAME }}/cloudflare-ddns-client
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: "latest,${{ env.RELEASE_VERSION }}"
+        run: make docker-publish

Dockerfile

@@ -1,4 +1,7 @@
 FROM alpine
+ARG TARGETOS
+ARG TARGETARCH
 RUN apk add --no-cache ca-certificates
-COPY dist/cloudflare-ddns-linux-amd64 /bin/cloudflare-ddns
-ENTRYPOINT [ "/bin/cloudflare-ddns" ]
+COPY dist/cloudflare-ddns-${TARGETOS}-${TARGETARCH} /bin/cloudflare-ddns
+ENTRYPOINT [ "/bin/cloudflare-ddns" ]
+CMD ["--daemon"]

Makefile

@@ -1,30 +1,40 @@
 # Version and linker flags
 # This will return either the current tag, branch, or commit hash of this repo.
-MODULE       := $(shell awk 'NR==1{print $$2}' go.mod)
-REPO_NAME    := cloudflare-ddns
-VERSION      := $(shell echo $$(ver=$$(git tag -l --points-at HEAD) && [ -z $$ver ] && ver=$$(git describe --always --dirty); printf $$ver))
-LDFLAGS      := -s -w -X $(MODULE)/conf.Version=$(VERSION) -X $(MODULE)/conf.ModuleName=$(MODULE)
-FLAGS        := -trimpath
-PROJECT_ROOT := $(shell cd -P -- '$(shell dirname -- "$0")' && pwd -P)
-BIN_NAME     := cloudflare-ddns
-DIST         := dist
-UNAME        := $(shell uname)
-GOTESTSUM    := go run gotest.tools/gotestsum
-GOVERALLS    := go run github.com/mattn/goveralls
-SOURCE       := $(shell find $(PROJECT_ROOT) -name '*.go')
-BINS         := $(shell find $(DIST) -name '$(BIN_NAME)-*')
-PLATFORMS    ?= darwin-amd64 dragonfly-amd64 freebsd-amd64 freebsd-arm freebsd-arm64 linux-amd64 linux-arm linux-arm64 netbsd-amd64 netbsd-arm netbsd-arm64 openbsd-amd64 openbsd-arm openbsd-arm64 windows-amd64 windows-arm
+MODULE               := $(shell awk 'NR==1{print $$2}' go.mod)
+REPO_NAME            := cloudflare-ddns
+VERSION              := $(shell echo $$(ver=$$(git tag -l --points-at HEAD) && [ -z $$ver ] && ver=$$(git describe --always --dirty); printf $$ver))
+# This is set during CI in .github/workflows/release.yml
+RELEASE_VERSION      ?= $(VERSION)
+LDFLAGS              := -s -w -X $(MODULE)/conf.Version=$(VERSION) -X $(MODULE)/conf.ModuleName=$(MODULE)
+FLAGS                := -trimpath
+PROJECT_ROOT         := $(shell cd -P -- '$(shell dirname -- "$0")' && pwd -P)
+BIN_NAME             := cloudflare-ddns
+DIST                 := dist
+UNAME                := $(shell uname)
+GOTESTSUM            := go run gotest.tools/gotestsum
+GOVERALLS            := go run github.com/mattn/goveralls
+SOURCE               := $(shell find $(PROJECT_ROOT) -name '*.go')
+BINS                 := $(shell find $(DIST) -name '$(BIN_NAME)-*')
+PLATFORMS            ?= darwin-amd64 dragonfly-amd64 freebsd-amd64 freebsd-arm freebsd-arm64 linux-amd64 linux-arm linux-arm64 netbsd-amd64 netbsd-arm netbsd-arm64 openbsd-amd64 openbsd-arm openbsd-arm64 windows-amd64 windows-arm
+DOCKER_PLATFORMS     ?= linux/amd64 linux/arm64
+DOCKER_REPO          ?= mattolenik
+DOCKER_TAG           ?= $(DOCKER_REPO)/cloudflare-ddns-client
+DOCKER_TAG_LATEST    := $(DOCKER_TAG):latest
+DOCKER_TAG_VERSIONED := $(DOCKER_TAG):$(RELEASE_VERSION)
 
 export TEST_BINARY := $(DIST)/$(BIN_NAME)
 
-default: all shasums test readme
+default: all shasums readme test
 
 build: $(DIST)/$(BIN_NAME)
 $(DIST)/$(BIN_NAME): $(SOURCE)
 	go build $(ARGS) $(FLAGS) -ldflags="$(LDFLAGS)" -o $@
 
 all: $(addprefix $(DIST)/$(BIN_NAME)-,$(PLATFORMS))
 
+docker-publish:
+	docker buildx build --push --tag $(DOCKER_TAG_LATEST) --tag $(DOCKER_TAG_VERSIONED) --platform linux/amd64,linux/arm64 .
+
 clean:
 	rm -rf dist && mkdir dist