From 6ce82c36fbaa1f18f7297183f3b9e1c9242cf6ee Mon Sep 17 00:00:00 2001
From: spikecodes <19519553+spikecodes@users.noreply.github.com>
Date: Fri, 9 Apr 2021 18:59:04 -0700
Subject: [PATCH] Use alpine only for ARM builds

---
 Dockerfile.arm64 | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 61d9a22..c3afd88 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,37 +1,28 @@
 ####################################################################################################
 ## Builder
 ####################################################################################################
-FROM rust:latest AS builder
+FROM rust:alpine AS builder
 
-RUN rustup target add aarch64-unknown-linux-musl
-RUN apt update && apt install -y musl-tools musl-dev
-RUN update-ca-certificates
-
-RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
+RUN apk add --no-cache g++
 
 WORKDIR /usr/src/libreddit
 
 COPY . .
 
-RUN cargo build --target aarch64-unknown-linux-musl --release
+RUN cargo install --path .
 
 ####################################################################################################
 ## Final image
 ####################################################################################################
-FROM scratch
+FROM alpine:latest
 
-# Import user information from builder.
-COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder /etc/group /etc/group
-
-# Import ca-certificates from builder
-COPY --from=builder /usr/share/ca-certificates /usr/share/ca-certificates
-COPY --from=builder /etc/ssl/certs /etc/ssl/certs
+RUN apk add --no-cache curl
 
 # Copy our build
-COPY --from=builder /usr/src/libreddit/target/aarch64-unknown-linux-musl/release/libreddit /usr/local/bin/libreddit
+COPY --from=builder /usr/local/cargo/bin/libreddit /usr/local/bin/libreddit
 
 # Use an unprivileged user.
+RUN adduser --home /nonexistent --no-create-home --disabled-password libreddit
 USER libreddit
 
 # Tell Docker to expose port 8080