Skip to content

Commit df33097

Browse files
committed
Apply further tidyup script and image flattening to all musl images
1 parent 088dd6f commit df33097

16 files changed

+111
-0
lines changed

docker/Dockerfile.aarch64-unknown-linux-musl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ RUN /qemu.sh aarch64
1818
COPY musl.sh /
1919
RUN /musl.sh TARGET=aarch64-linux-musl
2020

21+
COPY tidyup.sh /
22+
RUN /tidyup.sh
23+
24+
FROM scratch AS final
25+
COPY --from=build / /
26+
CMD ["/bin/bash"]
27+
2128
ENV CROSS_TOOLCHAIN_PREFIX=aarch64-linux-musl-
2229
ENV CROSS_SYSROOT=/usr/local/aarch64-linux-musl
2330
COPY musl-symlink.sh /

docker/Dockerfile.arm-unknown-linux-musleabi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ RUN /musl.sh \
2222
--with-float=soft \
2323
--with-mode=arm"
2424

25+
COPY tidyup.sh /
26+
RUN /tidyup.sh
27+
28+
FROM scratch AS final
29+
COPY --from=build / /
30+
CMD ["/bin/bash"]
31+
2532
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2633
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2734
COPY musl-symlink.sh /

docker/Dockerfile.arm-unknown-linux-musleabihf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ RUN /musl.sh \
2323
--with-float=hard \
2424
--with-mode=arm"
2525

26+
COPY tidyup.sh /
27+
RUN /tidyup.sh
28+
29+
FROM scratch AS final
30+
COPY --from=build / /
31+
CMD ["/bin/bash"]
32+
2633
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabihf-
2734
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
2835
COPY musl-symlink.sh /

docker/Dockerfile.armv5te-unknown-linux-musleabi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ RUN /musl.sh \
2222
--with-float=soft \
2323
--with-mode=arm"
2424

25+
COPY tidyup.sh /
26+
RUN /tidyup.sh
27+
28+
FROM scratch AS final
29+
COPY --from=build / /
30+
CMD ["/bin/bash"]
31+
2532
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2633
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2734
COPY musl-symlink.sh /

docker/Dockerfile.armv7-unknown-linux-musleabi

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ RUN /musl.sh \
2323
--with-mode=thumb \
2424
--with-mode=arm"
2525

26+
COPY tidyup.sh /
27+
RUN /tidyup.sh
28+
29+
FROM scratch AS final
30+
COPY --from=build / /
31+
CMD ["/bin/bash"]
32+
2633
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabi-
2734
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabi
2835
COPY musl-symlink.sh /

docker/Dockerfile.armv7-unknown-linux-musleabihf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@ RUN /musl.sh \
2323
--with-mode=thumb \
2424
--with-fpu=vfp"
2525

26+
COPY tidyup.sh /
27+
RUN /tidyup.sh
28+
29+
FROM scratch AS final
30+
COPY --from=build / /
31+
CMD ["/bin/bash"]
32+
2633
ENV CROSS_TOOLCHAIN_PREFIX=arm-linux-musleabihf-
2734
ENV CROSS_SYSROOT=/usr/local/arm-linux-musleabihf
2835
COPY musl-symlink.sh /

docker/Dockerfile.i586-unknown-linux-musl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ RUN /musl.sh TARGET=i586-linux-musl
1818
COPY qemu.sh /
1919
RUN /qemu.sh i386
2020

21+
COPY tidyup.sh /
22+
RUN /tidyup.sh
23+
24+
FROM scratch AS final
25+
COPY --from=build / /
26+
CMD ["/bin/bash"]
27+
2128
ENV CROSS_TOOLCHAIN_PREFIX=i586-linux-musl-
2229
ENV CROSS_SYSROOT=/usr/local/i586-linux-musl
2330
COPY musl-symlink.sh /

docker/Dockerfile.i686-unknown-linux-musl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ RUN /musl.sh TARGET=i686-linux-musl
1818
COPY qemu.sh /
1919
RUN /qemu.sh i386
2020

21+
COPY tidyup.sh /
22+
RUN /tidyup.sh
23+
24+
FROM scratch AS final
25+
COPY --from=build / /
26+
CMD ["/bin/bash"]
27+
2128
ENV CROSS_TOOLCHAIN_PREFIX=i686-linux-musl-
2229
ENV CROSS_SYSROOT=/usr/local/i686-linux-musl
2330
COPY musl-symlink.sh /

docker/Dockerfile.loongarch64-unknown-linux-musl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ RUN /qemu.sh loongarch64
2828
COPY qemu-runner base-runner.sh /
2929
COPY toolchain.cmake /opt/toolchain.cmake
3030

31+
COPY tidyup.sh /
32+
RUN /tidyup.sh
33+
34+
FROM scratch AS final
35+
COPY --from=build / /
36+
CMD ["/bin/bash"]
37+
ENV PATH=/x-tools/loongarch64-unknown-linux-musl/bin/:$PATH
38+
3139
ENV CROSS_TOOLCHAIN_PREFIX=loongarch64-unknown-linux-musl-
3240
ENV CROSS_SYSROOT=/x-tools/loongarch64-unknown-linux-musl/loongarch64-unknown-linux-musl/sysroot/
3341
ENV CROSS_TARGET_RUNNER="/qemu-runner loongarch64"

docker/Dockerfile.mips-unknown-linux-musl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ RUN /musl.sh \
2222
TARGET=mips-linux-muslsf \
2323
"COMMON_CONFIG += -with-arch=mips32r2"
2424

25+
COPY tidyup.sh /
26+
RUN /tidyup.sh
27+
28+
FROM scratch AS final
29+
COPY --from=build / /
30+
CMD ["/bin/bash"]
31+
2532
ENV CROSS_TOOLCHAIN_PREFIX=mips-linux-muslsf-
2633
ENV CROSS_SYSROOT=/usr/local/mips-linux-muslsf
2734
COPY musl-symlink.sh /

0 commit comments

Comments
 (0)