Reduce the image size of the build image

Since we now upload this to the registry try somewhat to reduce the
layer sizes.

Author: lazka

build-base/Dockerfile

@@ -2,23 +2,22 @@ FROM debian:bookworm AS build
 
 # Install WINE build dependencies
 RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources
-RUN apt update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get build-dep --install-recommends -y wine
-# debian does not pull in i686 mingw (needed for building "experimental wow64" support)
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y gcc-mingw-w64-i686
-
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y git
+RUN apt update && \
+    DEBIAN_FRONTEND="noninteractive" apt-get build-dep --install-recommends -y wine && \
+    # debian does not pull in i686 mingw (needed for building "experimental wow64" support)
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y gcc-mingw-w64-i686 && \
+    DEBIAN_FRONTEND="noninteractive" apt-get install -y git && \
+    rm -rf /var/lib/apt/lists/*
 
 # Build and install patched WINE (see https://github.com/msys2/MSYS2-packages/issues/682)
-RUN git clone https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc
-WORKDIR /tmp/winesrc
-# https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-17
-RUN git checkout aed38b3fea259c23738d60df67d562592d394393
-RUN ./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386
-RUN make -j $(nproc)
-RUN env DESTDIR=/wine make -j $(nproc) install
-RUN rm -rf /tmp/winesrc
-
-# Clean things up
-RUN find /wine -type f -exec strip --strip-all {} \;
-RUN rm -Rf /wine/usr/local/include
+RUN git clone --filter=tree:0 https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc && \
+    cd /tmp/winesrc && \
+    # https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-17
+    git checkout aed38b3fea259c23738d60df67d562592d394393 && \
+    ./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386 && \
+    make -j $(nproc) && \
+    env DESTDIR=/wine make -j $(nproc) install && \
+    rm -rf /tmp/winesrc && \
+    # Clean things up
+    find /wine -type f -exec strip --strip-all {} \; && \
+    rm -Rf /wine/usr/local/include

msys2/Dockerfile

@@ -1,7 +1,7 @@
 FROM ghcr.io/msys2/msys2-docker-build-base AS build
 
 # Install MSYS2
-RUN apt install -y zstd curl
+RUN apt update && apt install -y zstd curl
 RUN mkdir -p /tmp/msys64
 RUN curl --fail -L 'https://github.com/msys2/msys2-installer/releases/download/nightly-x86_64/msys2-base-x86_64-latest.tar.zst' | tar -x --zstd -C  /tmp/