From 88726a0cd73168231cb0f12c67d8ea964c263312 Mon Sep 17 00:00:00 2001 From: Eugene Kharkunov Date: Wed, 27 May 2026 17:14:41 +0300 Subject: [PATCH] Update Clang to 20 in Wine-based installations --- server/build-docker.sh | 4 ++-- server/docker/Dockerfile.nssdk.2143-env | 2 +- server/docker/Dockerfile.ps4.12500-env | 2 +- server/docker/Dockerfile.ps5.12000-env | 2 +- server/docker/Dockerfile.wine-env | 2 +- server/docker/Dockerfile.winsdk.2026_145136231-env | 2 +- server/docker/Dockerfile.xbox.251002-env | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/build-docker.sh b/server/build-docker.sh index 2e4085d6..6b85cdd4 100755 --- a/server/build-docker.sh +++ b/server/build-docker.sh @@ -77,13 +77,13 @@ for request in $REQUESTED; do DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_XBOX_PRIVATE_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker ;; wine) - DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.7.1 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker + DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.8.0 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker ;; android) DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.7.0 -t $DOCKER_REGISTRY/extender-android-env:latest -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker ;; winsdk-2026_145136231) - DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-winsdk-2026_145136231-env:1.0.0 -t $DOCKER_REGISTRY/extender-winsdk-2026_145136231-env:latest -f $SCRIPT_DIR/docker/Dockerfile.winsdk.2026_145136231-env $SCRIPT_DIR/docker + DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-winsdk-2026_145136231-env:1.1.0 -t $DOCKER_REGISTRY/extender-winsdk-2026_145136231-env:latest -f $SCRIPT_DIR/docker/Dockerfile.winsdk.2026_145136231-env $SCRIPT_DIR/docker ;; android-ndk*|winsdk-*|emsdk-*) DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --network host --load --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker diff --git a/server/docker/Dockerfile.nssdk.2143-env b/server/docker/Dockerfile.nssdk.2143-env index c12058b5..0d13b3de 100644 --- a/server/docker/Dockerfile.nssdk.2143-env +++ b/server/docker/Dockerfile.nssdk.2143-env @@ -14,7 +14,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ mkdir -p "${NINTENDO_SDK_ROOT}" && \ wget -q -O - "$(cat /run/secrets/DM_PACKAGES_URL)/${SWITCH_SDK_FILENAME}" | tar xz -C "${NINTENDO_SDK_ROOT}" --strip-components=1 -FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.7.1 +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.8.0 ARG NINTENDO_SDK_VERSION ARG NINTENDO_SDK_ROOT diff --git a/server/docker/Dockerfile.ps4.12500-env b/server/docker/Dockerfile.ps4.12500-env index 9cdec645..84c522c8 100644 --- a/server/docker/Dockerfile.ps4.12500-env +++ b/server/docker/Dockerfile.ps4.12500-env @@ -14,7 +14,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ mkdir -p "${PS4_SDK}" && \ wget -q -O - "$(cat /run/secrets/DM_PACKAGES_URL)/${PS4_SDK_FILENAME}" | tar xz -C "${PS4_SDK}" --strip-components=1 -FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.7.1 +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.8.0 ARG PS4_SDK_VERSION ARG PS4_SDK diff --git a/server/docker/Dockerfile.ps5.12000-env b/server/docker/Dockerfile.ps5.12000-env index 89ade8df..a9e606c4 100644 --- a/server/docker/Dockerfile.ps5.12000-env +++ b/server/docker/Dockerfile.ps5.12000-env @@ -14,7 +14,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ mkdir -p "${PS5_SDK}" && \ wget -q -O - "$(cat /run/secrets/DM_PACKAGES_URL)/${PS5_SDK_FILENAME}" | tar xz -C "${PS5_SDK}" --strip-components=1 -FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.7.1 +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.8.0 ARG PS5_SDK_VERSION ARG PS5_SDK diff --git a/server/docker/Dockerfile.wine-env b/server/docker/Dockerfile.wine-env index edf56e4f..0e6438c0 100644 --- a/server/docker/Dockerfile.wine-env +++ b/server/docker/Dockerfile.wine-env @@ -4,7 +4,7 @@ FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extend ENV WINEDEBUG="-all" ENV WINEPREFIX="/var/extender/.wine" ENV DISPLAY=":1" -ENV CLANG_VERSION=19 +ENV CLANG_VERSION=20 ENV CLANG_HOME=/usr/lib/llvm-${CLANG_VERSION} ENV CLANG_RESOURCE_DIR=/usr/lib/llvm-${CLANG_VERSION}/lib/clang/${CLANG_VERSION} ENV PATH=${CLANG_HOME}/bin:${PATH}:/opt/wine-stable/bin diff --git a/server/docker/Dockerfile.winsdk.2026_145136231-env b/server/docker/Dockerfile.winsdk.2026_145136231-env index 0f3d8812..70417fae 100644 --- a/server/docker/Dockerfile.winsdk.2026_145136231-env +++ b/server/docker/Dockerfile.winsdk.2026_145136231-env @@ -74,7 +74,7 @@ RUN \ WORKDIR / -FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.7.1 +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.8.0 ARG PLATFORMSDK_WIN32 ARG WINDOWS_SDK_VERSION diff --git a/server/docker/Dockerfile.xbox.251002-env b/server/docker/Dockerfile.xbox.251002-env index 709f7b71..c6dc35f8 100644 --- a/server/docker/Dockerfile.xbox.251002-env +++ b/server/docker/Dockerfile.xbox.251002-env @@ -13,7 +13,7 @@ RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \ mkdir -p "${XBOX_SDK}" && \ wget -q -O - "$(cat /run/secrets/DM_PACKAGES_URL)/${XBOX_SDK_FILENAME}" | tar xz -C "${XBOX_SDK}" --strip-components=1 -FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2026_145136231-env:1.0.0 +FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2026_145136231-env:1.1.0 ARG XBOX_SDK_VERSION ARG XBOX_SDK