Skip to content

Commit 19905c4

Browse files
classabbyampthe-maldridge
authored andcommitted
mini, mini-bb, thin-bb: fix build when xbps needs updating
xbps is not updated from the bootstrap image version for the / rootdir. This causes the second RUN directive to fail, sometimes silently because of the `|| exit 0`.
1 parent f234f54 commit 19905c4

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

Dockerfile.mini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
-r /target \
2020
xbps base-files dash coreutils grep run-parts sed gawk && \
2121
rm -rf /target/var/cache/
22-
RUN xbps-install -yMU binutils && \
22+
RUN xbps-install -yMU xbps && xbps-install -yMU binutils && \
2323
strip /target/usr/lib/* /target/usr/bin/* || exit 0
2424

2525
FROM scratch

Dockerfile.mini-bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
-r /target \
2020
xbps base-files busybox-huge && \
2121
rm -rf /target/var/cache/
22-
RUN xbps-install -yMU busybox-huge binutils && \
22+
RUN xbps-install -yMU xbps && xbps-install -yMU busybox-huge binutils && \
2323
for util in $(busybox --list) ; do [ ! -f /target/usr/bin/$util ] && ln -svf /usr/bin/busybox /target/usr/bin/$util ; done && \
2424
strip /target/usr/lib/* /target/usr/bin/* || exit 0
2525

Dockerfile.thin-bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN \
1919
-r /target \
2020
xbps base-files busybox-huge && \
2121
rm -rf /target/var/cache/
22-
RUN xbps-install -yMU busybox-huge && \
22+
RUN xbps-install -yMU xbps && xbps-install -yMU busybox-huge && \
2323
for util in $(busybox --list) ; do [ ! -f /target/usr/bin/$util ] && ln -svf /usr/bin/busybox /target/usr/bin/$util ; done
2424

2525
FROM scratch

0 commit comments

Comments
 (0)