ci: Adjust Docker image to Debian 12 "bookworm" #1356

pull hebasto wants to merge 3 commits into bitcoin-core:master from hebasto:230625-bookworm changing 3 files +24 −2

hebasto commented at 8:17 PM on June 25, 2023: member
Since the release of Debian 12 "bookworm", it has become the "stable" one that our ci/linux-debian.Dockerfile relies on.

Last time the Docker image was built basing on Debian Bullseye.

Changes in packages are significant, for instance:
- gcc 10.2. --> 12.2
- clang 11.0 --> 14.0
- wine 5.0 --> 8.0
which requires certain adjustments provided in this PR.

The first commit has been cherry-picked from #1313.
Help the compiler prove that a loop is entered 8a7273465b

in ci/cirrus.sh:57 in 6581a910e1 outdated

  52 | @@ -53,6 +53,21 @@ if [ -n "$WRAPPER_CMD" ]; then
  53 |      $WRAPPER_CMD --version
  54 |  fi
  55 |  
  56 | +case "${CC:-undefined}" in

real-or-random commented at 8:34 AM on June 26, 2023:

# Workaround for https://bugs.kde.org/show_bug.cgi?id=452758 (fixed in valgrind 3.20.0)
case "${CC:-undefined}" in

hebasto commented at 9:25 AM on June 26, 2023:

Updated.

in ci/linux-debian.Dockerfile:28 in 6581a910e1 outdated
```
  26 |          sagemath
  27 |  
  28 |  WORKDIR /root
  29 | +
  30 | +# A workaround for `wine` package failure to employ the Debian alternatives system properly.
  31 | +RUN ln -s /usr/lib/wine/wine64 /usr/bin/wine64
```
real-or-random commented at 8:35 AM on June 26, 2023:

What happens if we don't include this?

hebasto commented at 8:42 AM on June 26, 2023:

The wine64 won't be available in PATH, and the wine-msvc.sh script will fail.

real-or-random commented at 9:11 AM on June 26, 2023:

Ok, I see, wine-msvc.sh has wine64 hardcoded. Then I suggest including this ln in the RUN command of wine-msvc below. (Unless we really want to get rid of the wine convenience package, then we'll always need some manual symlink.)

hebasto commented at 9:25 AM on June 26, 2023:

Then I suggest including this ln in the RUN command of wine-msvc below.

Done.
in ci/linux-debian.Dockerfile:21 in 6581a910e1 outdated
```
  19 |          gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \
  20 |          gcc-arm-linux-gnueabihf libc6-dev-armhf-cross libc6-dbg:armhf \
  21 |          gcc-aarch64-linux-gnu libc6-dev-arm64-cross libc6-dbg:arm64 \
  22 |          gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross libc6-dbg:ppc64el \
  23 | -        gcc-mingw-w64-x86-64-win32 wine64 wine \
  24 | +        gcc-mingw-w64-x86-64-win32 wine64 \
```
real-or-random commented at 8:37 AM on June 26, 2023:

When I added this, the duplication was intentional. If every step in the dockerfile lists its dependencies, it's easier to remove steps. For example, if we ever want to get rid of msvc-wine, we can just drop that RUN step and the rest of the image is unaffected.

hebasto commented at 8:45 AM on June 26, 2023:

I see. It seems the wine package is not necessary for cross-compiling tasks anyway. But I need to test this assumption once more.

real-or-random commented at 9:08 AM on June 26, 2023:

It installs the wine symlink. I think that's convenient.

hebasto commented at 9:25 AM on June 26, 2023:

True. Reverted back.
real-or-random commented at 8:37 AM on June 26, 2023: contributor

Concept ACK, thanks for taking care of this! :)
ci: Force DWARF v4 for Clang when Valgrind tests are expected a1782098a9
ci: Adjust Docker image to Debian 12 "bookworm" c862a9fb49
hebasto force-pushed on Jun 26, 2023
hebasto commented at 9:25 AM on June 26, 2023: member

Addressed @real-or-random's comments.
hebasto renamed this:
~~ci: Adjust Docker image to Debian Bookworm~~
ci: Adjust Docker image to Debian 12 "bookworm"
on Jun 26, 2023
hebasto cross-referenced this on Jun 26, 2023 from issue Fix symbol visibility issues, add test for it by hebasto
real-or-random approved
real-or-random commented at 2:53 PM on June 26, 2023: contributor

ACK c862a9fb49e885dcafb42d4e21e05a244248aab0
real-or-random added the label ci on Jun 26, 2023
sipa commented at 6:14 PM on June 26, 2023: contributor

utACK c862a9fb49e885dcafb42d4e21e05a244248aab0
real-or-random merged this on Jun 27, 2023
real-or-random closed this on Jun 27, 2023
hebasto deleted the branch on Jun 27, 2023
vmta referenced this in commit 8f03457eed on Jul 1, 2023
fanquake referenced this in commit 56c05c5ec4 on Jul 17, 2023
fanquake referenced this in commit ff061fde18 on Jul 18, 2023
hebasto referenced this in commit 270d2b37b8 on Jul 21, 2023
jonasnick cross-referenced this on Jul 26, 2023 from issue Upstream PRs 1314, 1317, 1318, 1316, 1327, 1310, 1328, 1333, 1330, 1334, 1337, 1341, 1339, 1350, 1349, 1338, 1129, 1347, 1336, 1295, 1354, 1355, 1356 by jonasnick

Contributors

hebasto

real-or-random

sipa

Labels

Linked (view graph)

#1313 ci: Test on development snapshots of GCC and Clang #1359 Fix symbol visibility issues, add test for it