Commit 7cf0d47

committed

Use arch-specific dependencies; remove armv7

1 parent 7392b4f commit 7cf0d47Copy full SHA for 7cf0d47

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ jobs:`
`24`	`24`	`with:`
`25`	`25`	`context: .`
`26`	`26`	`file: ./Dockerfile`
`27`		`- platforms: linux/amd64,linux/arm/v7,linux/arm64`
	`27`	`+ platforms: linux/amd64,linux/arm64`
`28`	`28`	`push: false`
`29`	`29`	`tags: \|`
`30`	`30`	`${{ steps.docker_meta_ci.outputs.tags }}`
`@@ -96,7 +96,7 @@ jobs:`
`96`	`96`	`with:`
`97`	`97`	`context: .`
`98`	`98`	`file: ./Dockerfile`
`99`		`- platforms: linux/amd64,linux/arm/v7,linux/arm64`
	`99`	`+ platforms: linux/amd64,linux/arm64`
`100`	`100`	`push: ${{ github.event_name != 'pull_request' }}`
`101`	`101`	`tags: \|`
`102`	`102`	`${{ steps.docker_meta.outputs.tags }}`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,10 +27,11 @@ RUN set -x; \`
`27`	`27`	`curl \`
`28`	`28`	`libzip-dev \`
`29`	`29`	`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" \`
`34`	`35`	`&& docker-php-ext-install -j$(nproc) dom pdo pdo_mysql zip tidy \`
`35`	`36`	`&& docker-php-ext-configure ldap \`
`36`	`37`	`&& docker-php-ext-install -j$(nproc) ldap \`

Comments

(0)