From 34a74c3539aeea452968918b845aa1f5e757e00a Mon Sep 17 00:00:00 2001 From: Rick Henry <46894985+rjhenry@users.noreply.github.com> Date: Mon, 12 Sep 2022 15:54:56 +0100 Subject: [PATCH] Revert "Add arm64 platforms for docker image release" --- .github/workflows/release.yml | 4 ++-- Dockerfile | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a281d8c..938057e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: false tags: | ${{ steps.docker_meta_ci.outputs.tags }} @@ -113,7 +113,7 @@ jobs: with: context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: ${{ github.event_name != 'pull_request' }} tags: | ${{ steps.docker_meta.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 6d89121..1b10da9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,11 +27,10 @@ RUN set -x; \ curl \ libzip-dev \ unzip \ - && 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" \ + && 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 \ && docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \ && docker-php-ext-configure ldap \ && docker-php-ext-install -j$(nproc) ldap \