Skip to content

Commit 7cf0d47

Browse files
committed
Use arch-specific dependencies; remove armv7
1 parent 7392b4f commit 7cf0d47

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
context: .
2626
file: ./Dockerfile
27-
platforms: linux/amd64,linux/arm/v7,linux/arm64
27+
platforms: linux/amd64,linux/arm64
2828
push: false
2929
tags: |
3030
${{ steps.docker_meta_ci.outputs.tags }}
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
context: .
9898
file: ./Dockerfile
99-
platforms: linux/amd64,linux/arm/v7,linux/arm64
99+
platforms: linux/amd64,linux/arm64
100100
push: ${{ github.event_name != 'pull_request' }}
101101
tags: |
102102
${{ steps.docker_meta.outputs.tags }}

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ RUN set -x; \
2727
curl \
2828
libzip-dev \
2929
unzip \
30-
&& wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_amd64.deb \
31-
&& chmod a+x ./wkhtmltox_0.12.6-1.buster_amd64.deb \
32-
&& apt-get install -y ./wkhtmltox_0.12.6-1.buster_amd64.deb \
33-
&& rm ./wkhtmltox_0.12.6-1.buster_amd64.deb \
30+
&& arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) \
31+
&& wget "https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${arch}.deb" \
32+
&& chmod a+x "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \
33+
&& apt-get install -y "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \
34+
&& rm "./wkhtmltox_0.12.6-1.buster_${arch}.deb" \
3435
&& docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \
3536
&& docker-php-ext-configure ldap \
3637
&& docker-php-ext-install -j$(nproc) ldap \

0 commit comments

Comments
 (0)