From b52339a433acbc1437fbb931ef15eebf45eb92fc Mon Sep 17 00:00:00 2001 From: Nick Jansen Date: Tue, 17 Oct 2023 13:00:58 +0200 Subject: [PATCH] Use `TARGETARCH` build argument --- src/Dockerfile | 4 ++-- src/packages/{7.4-aarch64.txt => 7.4-arm64.txt} | 0 src/packages/{8.0-aarch64.txt => 8.0-arm64.txt} | 0 src/packages/{8.1-aarch64.txt => 8.1-arm64.txt} | 0 src/packages/{8.2-aarch64.txt => 8.2-arm64.txt} | 0 5 files changed, 2 insertions(+), 2 deletions(-) rename src/packages/{7.4-aarch64.txt => 7.4-arm64.txt} (100%) rename src/packages/{8.0-aarch64.txt => 8.0-arm64.txt} (100%) rename src/packages/{8.1-aarch64.txt => 8.1-arm64.txt} (100%) rename src/packages/{8.2-aarch64.txt => 8.2-arm64.txt} (100%) diff --git a/src/Dockerfile b/src/Dockerfile index caa534b..ee30cb5 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -3,7 +3,7 @@ FROM ghcr.io/sitepilot/runtime:1.x as cli USER root -ARG BUILDARCH="amd64" +ARG TARGETARCH ARG PHP_VERSION=8.1 ENV RUNTIME_LOG_LEVEL=3 \ @@ -11,7 +11,7 @@ ENV RUNTIME_LOG_LEVEL=3 \ RUN $RUNTIME_BIN_DIR/install gnupg2 less -ADD packages/${PHP_VERSION}-${BUILDARCH}.txt /tmp/packages.txt +ADD packages/${PHP_VERSION}-${TARGETARCH}.txt /tmp/packages.txt RUN wget -O /etc/apt/trusted.gpg.d/lst_debian_repo.gpg http://rpms.litespeedtech.com/debian/lst_debian_repo.gpg \ && wget -O /etc/apt/trusted.gpg.d/lst_repo.gpg http://rpms.litespeedtech.com/debian/lst_repo.gpg \ diff --git a/src/packages/7.4-aarch64.txt b/src/packages/7.4-arm64.txt similarity index 100% rename from src/packages/7.4-aarch64.txt rename to src/packages/7.4-arm64.txt diff --git a/src/packages/8.0-aarch64.txt b/src/packages/8.0-arm64.txt similarity index 100% rename from src/packages/8.0-aarch64.txt rename to src/packages/8.0-arm64.txt diff --git a/src/packages/8.1-aarch64.txt b/src/packages/8.1-arm64.txt similarity index 100% rename from src/packages/8.1-aarch64.txt rename to src/packages/8.1-arm64.txt diff --git a/src/packages/8.2-aarch64.txt b/src/packages/8.2-arm64.txt similarity index 100% rename from src/packages/8.2-aarch64.txt rename to src/packages/8.2-arm64.txt