From d728e0fde7d926241b5e61ed7873b50768cbc2ec Mon Sep 17 00:00:00 2001
From: John Dorman <427295+boostchicken@users.noreply.github.com>
Date: Thu, 23 Mar 2023 03:58:19 -0700
Subject: [PATCH] Update Dockerfile

---
 podman-update/build/Dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/podman-update/build/Dockerfile b/podman-update/build/Dockerfile
index 0495fe3..3819121 100644
--- a/podman-update/build/Dockerfile
+++ b/podman-update/build/Dockerfile
@@ -6,7 +6,7 @@ RUN git clone https://github.com/containers/netavark/
 WORKDIR /tmp/work/netavark
 ENV CARGO_TARGETS_DIR = targets
 RUN rustup target add aarch64-unknown-linux-gnu
-RUN cargo build --target aarch64-unknown-linux-gnu --release && cargo build --target aarch64-unknown-linux-gnu --bin netavark-dhcp-proxy-client --release && cp targets/$(profile)/netavark bin/netavark
+RUN cargo build --target aarch64-unknown-linux-gnu --release && cargo build --target aarch64-unknown-linux-gnu --bin netavark-dhcp-proxy-client --release && cp targets/$(profile)/* /tmp/work/netavark/bin/
 
 FROM golang:1.18.3-stretch
 
@@ -19,6 +19,13 @@ ARG CONMON_VERSION=v2.1.7
 ARG CRUN_VERSION=1.8.2
 ARG DEBIAN_FRONTEND=noninteractive
 
+
+RUN mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/bin \
+    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/libexec/podman/ \
+    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/share/containers/ \
+    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/etc/containers/
+    
+COPY --from=rust /tmp/work/netavark/bin/* /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/libexec/podman
 # Install dependencies
 RUN apt-get update && apt-get install -y \
     bc \
@@ -46,13 +53,9 @@ RUN apt-get update && apt-get install -y \
 
 ENV GOOS=linux
 
-RUN mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/bin \
-    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/libexec/podman/ \
-    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/share/containers/ \
-    && mkdir -p /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/etc/containers/
         
 RUN wget https://github.com/containers/crun/releases/download/${CRUN_VERSION}/crun-${CRUN_VERSION}-linux-arm64 -o /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/bin/crun
-COPY --from=rust /tmp/work/targets/release/netavark/bin/* /tmp/install/podman-${PODMAN_VERSION}-${UDM_PLATFORM}/usr/libexec/podman
+
 
 COPY ./podman.Makefile.${UDM_PLATFORM}.patch /tmp
 RUN mkdir -p /build \