From 7392b4fe967a2b64860fa8c7f36d2bd23618a4de Mon Sep 17 00:00:00 2001 From: Rounak Datta Date: Tue, 3 May 2022 16:13:22 +0530 Subject: [PATCH 1/2] Add arm64 platforms for docker image release --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 054bddd2..e56bfb57 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 push: false tags: | ${{ steps.docker_meta_ci.outputs.tags }} @@ -96,7 +96,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64 + platforms: linux/amd64,linux/arm/v7,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: | ${{ steps.docker_meta.outputs.tags }} From 7cf0d4700b710c94af97d6224c77c20c09183fde Mon Sep 17 00:00:00 2001 From: Rounak Datta Date: Fri, 13 May 2022 12:29:54 +0530 Subject: [PATCH 2/2] Use arch-specific dependencies; remove armv7 --- .github/workflows/release.yml | 4 ++-- Dockerfile | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e56bfb57..9ccd6183 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64 + platforms: linux/amd64,linux/arm64 push: false tags: | ${{ steps.docker_meta_ci.outputs.tags }} @@ -96,7 +96,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64 + platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: | ${{ steps.docker_meta.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 17245b29..cbe4b548 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,10 +27,11 @@ RUN set -x; \ curl \ libzip-dev \ unzip \ - && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb \ - && chmod a+x ./wkhtmltox_0.12.6-1.buster_amd64.deb \ - && apt-get install -y ./wkhtmltox_0.12.6-1.buster_amd64.deb \ - && rm ./wkhtmltox_0.12.6-1.buster_amd64.deb \ + && arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \ + && wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${arch}.deb" \ + && chmod a+x "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \ + && apt-get install -y "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \ + && rm "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \ && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \ && docker-php-ext-configure ldap \ && docker-php-ext-install -j$(nproc) ldap \