@@ -30,8 +30,6 @@ LABEL bootc.testimage="1"
3030FROM base as buildroot
3131# Flip this off to disable initramfs code
3232ARG initramfs=1
33- # Version for RPM build (optional, computed from git in Justfile)
34- ARG pkgversion=
3533# This installs our buildroot, and we want to cache it independently of the rest.
3634# Basically we don't want changing a .rs file to blow out the cache of packages.
3735RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/install-buildroot
@@ -44,6 +42,8 @@ WORKDIR /src
4442RUN --mount=type=cache,target=/src/target --mount=type=cache,target=/var/roothome cargo fetch
4543
4644FROM buildroot as build
45+ # Version for RPM build (optional, computed from git in Justfile)
46+ ARG pkgversion
4747# Build RPM directly from source, using cached target directory
4848RUN --mount=type=cache,target=/src/target --mount=type=cache,target=/var/roothome --network=none RPM_VERSION="${pkgversion}" /src/contrib/packaging/build-rpm
4949
@@ -64,7 +64,7 @@ FROM base
6464ARG variant
6565RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/configure-variant "${variant}"
6666# Support overriding the rootfs at build time conveniently
67- ARG rootfs=
67+ ARG rootfs
6868RUN --mount=type=bind,from=packaging,target=/run/packaging /run/packaging/configure-rootfs "${variant}" "${rootfs}"
6969# Inject additional content
7070COPY --from=packaging /usr-extras/ /usr/
0 commit comments