Merge pull request #350 from solidnerd/revert-321-arm64-release

Revert "Add arm64 platforms for docker image release"
solidnerd · Sep 12, 2022 · 6d59c44 · 6d59c44
2 parents 6e42996 + 34a74c3
commit 6d59c44
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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 \