From 7f009e804ca2a9f60bcd3eb445fb7426c94481c8 Mon Sep 17 00:00:00 2001 From: Kai Sassnowski Date: Wed, 31 Jul 2024 10:27:39 +0200 Subject: [PATCH] fix: use correct bun architecture --- 8.3/Dockerfile | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/8.3/Dockerfile b/8.3/Dockerfile index b5ea6c2..0b4ccfc 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -1,5 +1,8 @@ FROM php:8.3-alpine3.17 +# https://github.com/oven-sh/bun/issues/5545#issuecomment-1722461083 +ARG GLIBC_VERSION_AARCH64=2.26-r1 + # Add docker-php-extension-installer script ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ @@ -34,7 +37,7 @@ RUN apk add --no-cache \ zlib-dev # Install Bun and PHP extensions -RUN curl "https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64-baseline.zip" \ +RUN curl "https://github.com/oven-sh/bun/releases/latest/download/bun-linux-aarch64.zip" \ -fsSLO \ --compressed \ --retry 5 \ @@ -46,13 +49,25 @@ RUN curl "https://github.com/oven-sh/bun/releases/latest/download/bun-linux-x64- --retry 5 && \ gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ || (echo "error: failed to verify: latest" && exit 1) && \ - grep " bun-linux-x64-baseline.zip\$" SHASUMS256.txt | sha256sum -c - \ + grep " bun-linux-aarch64.zip\$" SHASUMS256.txt | sha256sum -c - \ || (echo "error: failed to verify: latest" && exit 1) && \ - unzip "bun-linux-x64-baseline.zip" && \ - mv "bun-linux-x64-baseline/bun" /usr/local/bin/bun && \ - rm -f "bun-linux-x64-baseline.zip" SHASUMS256.txt.asc SHASUMS256.txt && \ + unzip "bun-linux-aarch64.zip" && \ + mv "bun-linux-aarch64/bun" /usr/local/bin/bun && \ + rm -f "bun-linux-aarch64.zip" SHASUMS256.txt.asc SHASUMS256.txt && \ chmod +x /usr/local/bin/bun && \ chmod +x /usr/local/bin/install-php-extensions && \ + curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-${GLIBC_VERSION_AARCH64}.apk" \ + -fsSLO \ + --compressed \ + --retry 5 \ + || (echo "error: failed to download: glibc v${GLIBC_VERSION_AARCH64}" && exit 1) && \ + mv "glibc-${GLIBC_VERSION_AARCH64}.apk" glibc.apk && \ + curl "https://raw.githubusercontent.com/squishyu/alpine-pkg-glibc-aarch64-bin/master/glibc-bin-${GLIBC_VERSION_AARCH64}.apk" \ + -fsSLO \ + --compressed \ + --retry 5 \ + || (echo "error: failed to download: glibc-bin v${GLIBC_VERSION_AARCH64}" && exit 1) && \ + mv "glibc-bin-${GLIBC_VERSION_AARCH64}.apk" glibc-bin.apk && \ install-php-extensions \ @composer \ redis-stable \