From c500ec071efb2aef2f55b7510330fd0514f18c24 Mon Sep 17 00:00:00 2001 From: Julien Neuhart Date: Tue, 21 Sep 2021 18:38:11 +0200 Subject: [PATCH] feat: support armhf & i386 architectures (#355) --- Makefile | 2 +- build/Dockerfile | 2 +- scripts/release.sh | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 72c361ae..9adb1edb 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ godoc: ## Run a webserver with Gotenberg godoc (go get golang.org/x/tools/cmd/go godoc -http=:6060 .PHONY: release -release: ## Build the Gotenberg's Docker image for linux/amd64 and linux/arm64 platforms, then push it to a Docker repository +release: ## Build the Gotenberg's Docker image for many platforms, then push it to a Docker repository ./scripts/release.sh \ $(GOLANG_VERSION) \ $(GOTENBERG_VERSION) \ diff --git a/build/Dockerfile b/build/Dockerfile index 7377c889..f4dbd190 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -52,7 +52,7 @@ ARG NOTO_COLOR_EMOJI_VERSION ARG PDFTK_VERSION # Script for installing either Google Chrome stable on amd64 architecture or -# Chromium on arm64 architecture. +# Chromium on other architectures. # See https://github.com/gotenberg/gotenberg/issues/328. COPY build/install-chromium.sh /tmp/install-chromium.sh diff --git a/scripts/release.sh b/scripts/release.sh index 196ef61a..676e96a2 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -26,6 +26,8 @@ docker buildx build \ --build-arg PDFTK_VERSION="$PDFTK_VERSION" \ --platform linux/amd64 \ --platform linux/arm64 \ + --platform linux/arm/v7 \ + --platform linux/386 \ -t "$DOCKER_REPOSITORY/gotenberg:latest" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}" \ @@ -39,6 +41,8 @@ docker buildx build \ --build-arg GOTENBERG_VERSION="$GOTENBERG_VERSION" \ --platform linux/amd64 \ --platform linux/arm64 \ + --platform linux/arm/v7 \ + --platform linux/386 \ -t "$DOCKER_REPOSITORY/gotenberg:latest-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}-cloudrun" \ -t "$DOCKER_REPOSITORY/gotenberg:${SEMVER[0]}.${SEMVER[1]}-cloudrun" \