From c3f1c2d4985005cb12a8b66d673e2e9af81a8db9 Mon Sep 17 00:00:00 2001 From: John Dorman <427295+boostchicken@users.noreply.github.com> Date: Thu, 23 Mar 2023 06:15:16 -0700 Subject: [PATCH] Update Dockerfile --- podman-update/build/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/podman-update/build/Dockerfile b/podman-update/build/Dockerfile index f6be60a..7729b36 100644 --- a/podman-update/build/Dockerfile +++ b/podman-update/build/Dockerfile @@ -17,16 +17,20 @@ RUN apt-get update && apt-get install -y \ RUN git clone https://github.com/containers/netavark/ WORKDIR /tmp/work/netavark -RUN mkdir .cargo +RUN mkdir .cargo && COPY config.toml ./.cargo/config.toml RUN mkdir targets && mkdir bin -ENV CARGO_TARGETS_DIR = targets +ENV CARGO_TARGETS_DIR=targets RUN git checkout ${NETAVARK_VERSION} && rustup target add aarch64-unknown-linux-gnu RUN --mount=type=cache,target=/usr/local/cargo/registry \ - --mount=type=cache,target=/tmp/work/netavark/target \ - cargo build --target aarch64-unknown-linux-gnu --release && cp targets/aarch64-unknown-linux-gnu/release/netavark /tmp/work/netavark/bin/ + --mount=type=cache,target=/tmp/work/netavark/targets \ + cargo build --target aarch64-unknown-linux-gnu --release + +RUN ls /tmp/work/netavark/ && ls /tmp/work/netavark/targets && ls /tmp/work/netavark/targets/aarch64-unknown-linux-gnu + +RUN cp /tmp/work/netavark/targets/aarch64-unknown-linux-gnu/release/netavark /tmp/work/netavark/bin/ && cp /tmp/work/netavark/targets/aarch64-unknown-linux-gnu/release/netavark-dhcp-client-proxy /tmp/work/netavark/bin/ FROM golang:1.18.3-stretch # Currenrtly supported versions: UDM-Base UDM-Pro-SE