Skip to content

Commit c862a9f

Browse files
committed
ci: Adjust Docker image to Debian 12 "bookworm"
1 parent a178209 commit c862a9f

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ci/linux-debian.Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ RUN dpkg --add-architecture i386 && \
1111
RUN apt-get update && apt-get install --no-install-recommends -y \
1212
git ca-certificates \
1313
make automake libtool pkg-config dpkg-dev valgrind qemu-user \
14-
gcc clang llvm libc6-dbg \
14+
gcc clang llvm libclang-rt-dev libc6-dbg \
1515
g++ \
16-
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libubsan1:i386 libasan6:i386 \
16+
gcc-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 libubsan1:i386 libasan8:i386 \
1717
gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
1818
gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6-dbg:armhf \
1919
gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6-dbg:arm64 \
@@ -26,6 +26,9 @@ WORKDIR /root
2626
# The "wine" package provides a convience wrapper that we need
2727
RUN apt-get update && apt-get install --no-install-recommends -y \
2828
git ca-certificates wine64 wine python3-simplejson python3-six msitools winbind procps && \
29+
# Workaround for `wine` package failure to employ the Debian alternatives system properly.
30+
ln -s /usr/lib/wine/wine64 /usr/bin/wine64 && \
31+
# Set of tools for using MSVC on Linux.
2932
git clone https://github.com/mstorsjo/msvc-wine && \
3033
mkdir /opt/msvc && \
3134
python3 msvc-wine/vsdownload.py --accept-license --dest /opt/msvc Microsoft.VisualStudio.Workload.VCTools && \

0 commit comments

Comments
 (0)