File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change 2424 with :
2525 context : .
2626 file : ./Dockerfile
27- platforms : linux/amd64
27+ platforms : linux/amd64,linux/arm64
2828 push : false
2929 tags : |
3030 ${{ steps.docker_meta_ci.outputs.tags }}
9696 with :
9797 context : .
9898 file : ./Dockerfile
99- platforms : linux/amd64
99+ platforms : linux/amd64,linux/arm64
100100 push : ${{ github.event_name != 'pull_request' }}
101101 tags : |
102102 ${{ steps.docker_meta.outputs.tags }}
Original file line number Diff line number Diff 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 \
You can’t perform that action at this time.
0 commit comments