Skip to content

Commit

Permalink
refactor: extract build variables
Browse files Browse the repository at this point in the history
Signed-off-by: Martin Kröning <[email protected]>
  • Loading branch information
mkroening committed Aug 9, 2024
1 parent 97ab14d commit e1e6249
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
ARG TARGET_ARCH=x86_64
ARG TARGET=hermit-${TARGET_ARCH}
ARG PREFIX=/opt/hermit

FROM --platform=$BUILDPLATFORM rust:bookworm AS kernel
ADD --link https://github.com/hermit-os/kernel.git#hermit-c /kernel
WORKDIR /kernel
Expand All @@ -9,6 +13,8 @@ RUN cargo xtask build \
--features pci,smp,acpi,newlib,tcp,dhcpv4

FROM buildpack-deps:bookworm AS builder
ARG TARGET
ARG PREFIX

RUN set -eux; \
apt-get update; \
Expand Down Expand Up @@ -37,10 +43,11 @@ ADD --link https://github.com/hermit-os/newlib.git newlib
ADD --link https://github.com/hermit-os/pthread-embedded.git pte
ADD --link ./toolchain.sh ./toolchain.sh

RUN ./toolchain.sh x86_64-hermit /opt/hermit
RUN ./toolchain.sh ${TARGET} ${PREFIX}


FROM rust:bookworm AS toolchain
ARG PREFIX

RUN set -eux; \
apt-get update; \
Expand All @@ -51,6 +58,6 @@ RUN set -eux; \
; \
rm -rf /var/lib/apt/lists/*;

COPY --from=builder /opt/hermit /opt/hermit
ENV PATH=/opt/hermit/bin:$PATH \
LD_LIBRARY_PATH=/opt/hermit/lib:$LD_LIBRARY_PATH
COPY --from=builder ${PREFIX} ${PREFIX}
ENV PATH=${PREFIX}/bin:$PATH \
LD_LIBRARY_PATH=${PREFIX}/lib:$LD_LIBRARY_PATH

0 comments on commit e1e6249

Please sign in to comment.