Containerfile: split long RUN lines
They're getting quite long and hard to parse. Split for legibility.
This commit is contained in:
parent
230c105895
commit
0980197ad9
|
|
@ -39,10 +39,15 @@ COPY . /src
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
RUN rm -vf /src/*.repo
|
RUN rm -vf /src/*.repo
|
||||||
COPY --from=repos /etc/yum.repos.d/*.repo /src
|
COPY --from=repos /etc/yum.repos.d/*.repo /src
|
||||||
RUN --mount=type=cache,target=/workdir --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared rpm-ostree compose image \
|
RUN --mount=type=cache,target=/workdir \
|
||||||
--image-config fedora-bootc-config.json --cachedir=/workdir --format=ociarchive --initialize ${MANIFEST} /buildcontext/out.ociarchive
|
--mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared \
|
||||||
|
rpm-ostree compose image --image-config fedora-bootc-config.json \
|
||||||
|
--cachedir=/workdir --format=ociarchive --initialize ${MANIFEST} \
|
||||||
|
/buildcontext/out.ociarchive
|
||||||
|
|
||||||
FROM oci-archive:./out.ociarchive
|
FROM oci-archive:./out.ociarchive
|
||||||
# Need to reference builder here to force ordering. But since we have to run
|
# Need to reference builder here to force ordering. But since we have to run
|
||||||
# something anyway, we might as well cleanup after ourselves.
|
# something anyway, we might as well cleanup after ourselves.
|
||||||
RUN --mount=type=bind,from=builder,src=.,target=/var/tmp --mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared rm /buildcontext/out.ociarchive
|
RUN --mount=type=bind,from=builder,src=.,target=/var/tmp \
|
||||||
|
--mount=type=bind,rw=true,src=.,dst=/buildcontext,bind-propagation=shared \
|
||||||
|
rm /buildcontext/out.ociarchive
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue