Multiarch Docker images (#337)

Author: ajanikow

Dockerfile.ma

@@ -0,0 +1,23 @@
+ARG IMAGE=alpine:3.16
+FROM ${IMAGE}
+MAINTAINER Max Neunhoeffer <max@arangodb.com>
+
+ARG TARGETARCH
+COPY bin/linux/${TARGETARCH}/arangodb /app/
+
+EXPOSE 8528
+
+VOLUME /data
+
+# Data directory
+ENV DATA_DIR=/data
+
+# Signal running in docker
+ENV RUNNING_IN_DOCKER=true
+
+# Docker image containing arangod.
+ENV DOCKER_IMAGE=arangodb/arangodb:latest
+
+ENTRYPOINT ["/app/arangodb"]
+
+RUN /app/arangodb version

Makefile

@@ -10,11 +10,18 @@ VERSION_MAJOR := $(shell echo $(VERSION_MAJOR_MINOR) | cut -f 1 -d '.')
 COMMIT := $(shell git rev-parse --short HEAD)
 MAKEFILE := $(ROOTDIR)/Makefile
 
+ifndef MULTIARCH
+MULTIARCH:=1
+endif
+
 ALPINE_IMAGE ?= alpine:3.11
 
 DOCKERCLI ?= $(shell which docker)
 GOBUILDLINKTARGET := ../../../..
 
+DOCKERMACLI := $(DOCKERCLI) buildx build -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
+               			--platform linux/amd64,linux/arm64
+
 BUILDDIR ?= $(ROOTDIR)
 
 GOBUILDDIR := $(BUILDDIR)/.gobuild
@@ -163,15 +170,27 @@ $(TESTBIN): $(GOBUILDDIR) $(TEST_SOURCES) $(BIN)
 	@mkdir -p $(BINDIR)
 	$(DOCKER_CMD) go test -c -o "$(TEST_BIN)" ./test
 
+ifndef MULTIARCH
 docker: build
 	$(DOCKERCLI) build -t arangodb/arangodb-starter --build-arg "IMAGE=$(ALPINE_IMAGE)" .
+else
+docker: binaries
+	$(DOCKERCLI) buildx build -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
+			--platform linux/amd64,linux/arm64 -t arangodb/arangodb-starter .
+endif
 
+ifndef MULTIARCH
 docker-push: docker
 ifneq ($(DOCKERNAMESPACE), arangodb)
 	docker tag arangodb/arangodb-starter $(DOCKERNAMESPACE)/arangodb-starter
 endif
 	docker push $(DOCKERNAMESPACE)/arangodb-starter
+else
+docker-push: docker
+	$(DOCKERMACLI) --push -t $(DOCKERNAMESPACE)/arangodb-starter .
+endif
 
+ifndef MULTIARCH
 docker-push-version: docker
 	docker tag arangodb/arangodb-starter arangodb/arangodb-starter:$(VERSION)
 	docker tag arangodb/arangodb-starter arangodb/arangodb-starter:$(VERSION_MAJOR_MINOR)
@@ -181,6 +200,13 @@ docker-push-version: docker
 	docker push arangodb/arangodb-starter:$(VERSION_MAJOR_MINOR)
 	docker push arangodb/arangodb-starter:$(VERSION_MAJOR)
 	docker push arangodb/arangodb-starter:latest
+else
+docker-push-version: docker
+	$(DOCKERMACLI) --push -t arangodb/arangodb-starter:$(VERSION)
+	$(DOCKERMACLI) --push -t arangodb/arangodb-starter:$(VERSION_MAJOR_MINOR)
+	$(DOCKERMACLI) --push -t arangodb/arangodb-starter:$(VERSION_MAJOR)
+	$(DOCKERMACLI) --push -t arangodb/arangodb-starter:latest
+endif
 
 $(RELEASE): $(GOBUILDDIR) $(GO_SOURCES)
 	$(DOCKER_CMD) go build -o "$(RELEASE_BIN)" $(REPOPATH)/tools/release