From a846c1e82dc3314fe21821fde8030f759c1c43d7 Mon Sep 17 00:00:00 2001 From: nkraetzschmar <9020053+nkraetzschmar@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:01:34 +0200 Subject: [PATCH] feat: build datefudge and resizefat32 --- Dockerfile | 6 ++++++ pkg.list | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Dockerfile b/Dockerfile index e06fa58..769447f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins RUN git clone --branch debian/1.26 --depth=1 https://salsa.debian.org/debian/datefudge.git RUN make -C datefudge install +FROM debian:testing AS resizefat32 +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends build-essential ca-certificates git +RUN git clone https://github.com/gardenlinux/resizefat32 +RUN make -C resizefat32 install + FROM debian:testing LABEL org.opencontainers.image.source="https://github.com/gardenlinux/builder" @@ -31,6 +36,7 @@ COPY --from=mv_data /usr/bin/mv_data /usr/bin/mv_data COPY --from=aws-kms-pkcs11 /aws_kms_pkcs11.so /aws_kms_pkcs11.so COPY --from=datefudge /usr/lib/datefudge/datefudge.so /usr/lib/datefudge/datefudge.so COPY --from=datefudge /usr/bin/datefudge /usr/bin/datefudge +COPY --from=resizefat32 /usr/bin/resizefat32 /usr/bin/resizefat32 RUN mv /aws_kms_pkcs11.so "/usr/lib/$(uname -m)-linux-gnu/pkcs11/aws_kms_pkcs11.so" COPY builder /builder RUN mkdir /builder/cert diff --git a/pkg.list b/pkg.list index f454f58..254cc19 100644 --- a/pkg.list +++ b/pkg.list @@ -8,7 +8,9 @@ cryptsetup curl dosfstools e2fsprogs +erofs-utils fdisk +file gnupg2 libcurl4 libengine-pkcs11-openssl