From 55643affd4b6cf4ea4003fdaff71e4b55fd35274 Mon Sep 17 00:00:00 2001 From: Jordan Webb Date: Tue, 2 Feb 2021 01:18:12 -0600 Subject: [PATCH] Prepare for multi-platform build --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15a0872..d8f2857 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,15 +5,15 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ apt-get install -y --no-install-recommends unzip -# Set the flavour arg to the string you got in Detecting flavour section. -# For example if the flavour is `amd64` the command will be -ARG FLAVOUR=amd64 +# docker buildx will fill these in +ARG TARGETARCH=amd64 +ARG TARGETVARIANT= # 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=${FLAVOUR} /tmp/pleroma.zip +ADD https://git.pleroma.social/api/v4/projects/2/jobs/artifacts/stable/download?job=${TARGETARCH}${TARGETVARIANT:+${TARGETVARIANT}l} /tmp/pleroma.zip RUN mkdir -p /opt/pleroma && \ unzip /tmp/pleroma.zip -d /tmp/ && \