phundrak/docker-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use TARGETARCH properly (#26)

Browse Source 
We were bungling things and accidentally bundling the amd64 build of
Pleroma into every platform's container.
This commit is contained in:
Jordan Webb 2022-05-01 10:26:56 -05:00 committed by GitHub
parent 560da4d629
commit 6f627ddfca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -5,15 +5,14 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends unzip apt-get install -y --no-install-recommends unzip
# docker buildx will fill these in # docker buildx will fill this in
ARG TARGETARCH=amd64 ARG TARGETARCH
ARG TARGETVARIANT=
# Clone the release build into a temporary directory and unpack it # 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 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 # We use a separate layer for extraction so we don't end up with junk
# from ADD left over in the final image. # 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 && \ RUN mkdir -p /opt/pleroma && \
unzip /tmp/pleroma.zip -d /tmp/ && \ unzip /tmp/pleroma.zip -d /tmp/ && \