Make image multi-arch ready (#19)

Signed-off-by: Tamal Saha <[email protected]>

Author: tamalsaha

.github/workflows/release.yml

@@ -5,11 +5,13 @@ on:
     tags:
       - "*.*"
       - "*.*.*"
-
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
   cancel-in-progress: true
+
 jobs:
   build:
     name: Build
@@ -29,14 +31,16 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: 1gtm
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Run checks
         run: |
           make ci
 
       - name: Build
-        env:
-          DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-          USERNAME: 1gtm
         run: |
-          docker login --username ${USERNAME} --password ${DOCKER_TOKEN}
-          make push
+          make release

Dockerfile

@@ -1,7 +1,24 @@
-FROM tianon/toybox:0.8.4
+FROM alpine
+
+ARG TARGETOS
+ARG TARGETARCH
+
+RUN set -x \
+	&& apk add --update ca-certificates curl
+
+RUN curl -fsSL -o tini https://github.com/kubedb/tini/releases/download/v0.20.0/tini-static-${TARGETARCH} \
+	&& chmod +x tini
+
+
+
+FROM alpine
+
+LABEL org.opencontainers.image.source https://github.com/kubedb/mysql-init-docker
+
+RUN apk add --no-cache bash
 
 COPY scripts /tmp/scripts
 COPY init-script /init-script
-COPY tini /tmp/scripts/tini
+COPY --from=0 /tini /tmp/scripts/tini
 
 ENTRYPOINT ["/init-script/run.sh"]

Makefile

@@ -1,26 +1,51 @@
 SHELL=/bin/bash -o pipefail
 
-REGISTRY ?= kubedb
-BIN      := mysql-init
-IMAGE    := $(REGISTRY)/$(BIN)
-TAG      := $(shell git describe --exact-match --abbrev=0 2>/dev/null || echo "")
+REGISTRY   ?= kubedb
+BIN        ?= mysql-init
+IMAGE      := $(REGISTRY)/$(BIN)
+TAG        ?= $(shell git describe --exact-match --abbrev=0 2>/dev/null || echo "")
 
-.PHONY: push
-push: container
-	docker push $(IMAGE):$(TAG)
+DOCKER_PLATFORMS := linux/amd64 linux/arm64
+PLATFORM         ?= linux/$(subst x86_64,amd64,$(subst aarch64,arm64,$(shell uname -m)))
+VERSION          = $(TAG)_$(subst /,_,$(PLATFORM))
+
+container-%:
+	@$(MAKE) container \
+	    --no-print-directory \
+	    PLATFORM=$(subst _,/,$*)
+
+push-%:
+	@$(MAKE) push \
+	    --no-print-directory \
+	    PLATFORM=$(subst _,/,$*)
+
+all-container: $(addprefix container-, $(subst /,_,$(DOCKER_PLATFORMS)))
+
+all-push: $(addprefix push-, $(subst /,_,$(DOCKER_PLATFORMS)))
 
 .PHONY: container
 container:
-	wget -qO tini https://github.com/kubedb/tini/releases/download/v0.20.0/tini-static
-	chmod +x tini
-	chmod +x init-script/run.sh
-	find $$(pwd)/scripts -type f -exec chmod +x {} \;
-	docker build --pull -t $(IMAGE):$(TAG) .
-	rm tini
+	@echo "container: $(IMAGE):$(VERSION)"
+	@docker buildx build --platform $(PLATFORM) --load --pull -t $(IMAGE):$(VERSION) -f Dockerfile .
+	@echo
+
+push: container
+	@docker push $(IMAGE):$(VERSION)
+	@echo "pushed: $(IMAGE):$(VERSION)"
+	@echo
+
+.PHONY: docker-manifest
+docker-manifest:
+	docker manifest create -a $(IMAGE):$(TAG) $(foreach PLATFORM,$(DOCKER_PLATFORMS),$(IMAGE):$(TAG)_$(subst /,_,$(PLATFORM)))
+	docker manifest push $(IMAGE):$(TAG)
+
+.PHONY: release
+release:
+	@$(MAKE) all-push docker-manifest --no-print-directory
 
 .PHONY: version
 version:
-	@echo ::set-output name=version::$(TAG)
+	@echo ::set-output name=version::$(VERSION)
 
 .PHONY: fmt
 fmt:
@@ -39,5 +64,5 @@ ci: verify
 .PHONY: push-to-kind
 push-to-kind: container
 	@echo "Loading docker image into kind cluster...."
-	@kind load docker-image $(IMAGE):$(TAG)
-	@echo "Image has been pushed successfully into kind cluster."
+	@kind load docker-image $(IMAGE):$(VERSION)
+	@echo "Image has been pushed successfully into kind cluster."