Branch: refs/heads/builder_windows_update_base_image Author: Enrico Tröger enrico.troeger@uvena.de Committer: Enrico Tröger enrico.troeger@uvena.de Date: Wed, 01 Jan 2025 12:21:15 UTC Commit: b72326d9784f207523f0f45d896cee3f242ebac2 https://github.com/geany/infrastructure/commit/b72326d9784f207523f0f45d896ce...
Log Message: ----------- Builders: Update base image to Debian Trixie
This brings newer versions of the used mingw64 cross compiler tool chain and also newer Wine versions.
Relates to #4088.
Modified Paths: -------------- builders/Dockerfile.mingw64 builders/mingw64/bin/mingw-w64-i686-wine builders/mingw64/bin/mingw-w64-x86_64-wine
Modified: builders/Dockerfile.mingw64 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -9,7 +9,7 @@ # For more details, see build_mingw64_geany.sh where this image is used. #
-FROM debian:bullseye +FROM debian:trixie
# Find the latest version on https://packages.msys2.org/package/msys2-keyring ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20230703-1-any.pkg.tar.zst" @@ -33,7 +33,7 @@ RUN set -ex && \ apt-get update && \ apt-get install --no-install-recommends --assume-yes \ # libraries \ - libcurl3-gnutls libgpgme11 libarchive13 libssl1.1 \ + libcurl3t64-gnutls libgpgme11t64 libarchive13t64 \ # common useful utilities \ wget curl less nano git gnupg2 file ca-certificates \ zip unzip xz-utils zstd \
Modified: builders/mingw64/bin/mingw-w64-i686-wine 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ #!/bin/sh -e
-WINEPATH="${WINEPATH};/windows/mingw32/bin" wine $@ +WINEPATH="${WINEPATH};/windows/mingw32/bin" /usr/lib/wine/wine $@
Modified: builders/mingw64/bin/mingw-w64-x86_64-wine 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,3 +1,3 @@ #!/bin/sh -e
-WINEPATH="${WINEPATH};/windows/mingw64/bin" wine64 $@ +WINEPATH="${WINEPATH};/windows/mingw64/bin" /usr/lib/wine/wine64 $@
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).