From 6f627ddfcae0afd9e601785814f9d40a912ede75 Mon Sep 17 00:00:00 2001 From: Jordan Webb Date: Sun, 1 May 2022 10:26:56 -0500 Subject: [PATCH] Use TARGETARCH properly (#26) We were bungling things and accidentally bundling the amd64 build of Pleroma into every platform's container. --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f90a36f..7700203 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,14 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends unzip -# docker buildx will fill these in -ARG TARGETARCH=amd64 -ARG TARGETVARIANT= +# docker buildx will fill this in +ARG TARGETARCH # Clone the release build into a temporary directory and unpack it # We use ADD here to bust the cache if the pleroma release changes # We use a separate layer for extraction so we don't end up with junk # from ADD left over in the final image. -ADD https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=${TARGETARCH}${TARGETVARIANT:+${TARGETVARIANT}l} /tmp/pleroma.zip +ADD https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=${TARGETARCH} /tmp/pleroma.zip RUN mkdir -p /opt/pleroma && \ unzip /tmp/pleroma.zip -d /tmp/ && \