From bd418c55d8b9a9453ca3f57d7ff4953d539c5dca Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Tue, 5 Mar 2024 01:48:51 -0800
Subject: [PATCH] simplify containerfile

---
 Containerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Containerfile b/Containerfile
index 23ef438..9c85bee 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,6 +1,4 @@
-FROM scratch AS base
-
-FROM base AS fetch
+FROM scratch AS build
 COPY --from=stagex/rust . /
 COPY --from=stagex/busybox . /
 COPY --from=stagex/musl . /
@@ -10,11 +8,6 @@ COPY --from=stagex/libunwind . /
 COPY --from=stagex/openssl . /
 COPY --from=stagex/zlib . /
 COPY --from=stagex/ca-certificates . /
-ADD . /src
-WORKDIR /src
-RUN cargo fetch
-
-FROM fetch AS build
 COPY --from=stagex/clang . /
 COPY --from=stagex/linux-headers . /
 COPY --from=stagex/gmp . /
@@ -22,6 +15,9 @@ COPY --from=stagex/nettle . /
 COPY --from=stagex/pcsc-lite . /
 COPY --from=stagex/pkgconf . /
 COPY --from=stagex/binutils . /
+ADD . /src
+WORKDIR /src
+RUN cargo fetch
 ENV NETTLE_STATIC=yes
 ENV PCSC_LIB_NAME=static=pcsclite
 ENV RUSTFLAGS='-C codegen-units=1'
@@ -33,5 +29,5 @@ RUN --network=none \
         --target x86_64-unknown-linux-musl \
         --bin keyfork
 
-FROM scratch AS install
+FROM scratch AS package
 COPY --from=build keyfork/target/release/keyfork /keyfork