defold · ekharkunov · Oct 28, 2025 · Oct 28, 2025
diff --git a/server/build-docker.sh b/server/build-docker.sh
@@ -17,24 +17,24 @@ MULTI_ARCH="linux/amd64"
 
 # base images
 echo "Base image with archs: $MULTI_ARCH"
-DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform $MULTI_ARCH -t $DOCKER_REGISTRY/extender-base-env:1.4.0 -t $DOCKER_REGISTRY/extender-base-env:latest -f $SCRIPT_DIR/docker/Dockerfile.base-env $SCRIPT_DIR/docker
+DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform $MULTI_ARCH -t $DOCKER_REGISTRY/extender-base-env:1.5.0 -t $DOCKER_REGISTRY/extender-base-env:latest -f $SCRIPT_DIR/docker/Dockerfile.base-env $SCRIPT_DIR/docker
 
 REQUESTED="$@"
 [ -z "$REQUESTED" ] && REQUESTED="android windows web ps4 ps5 nintendo linux"
 for request in $REQUESTED; do
     INSTALL=""
     case $request in
         web)
-            INSTALL="emsdk-2011 emsdk-3155 emsdk-3165 emsdk-406"
+            INSTALL="emsdk-3155 emsdk-3165 emsdk-406"
             ;;
         ps4)
-            INSTALL="wine ps4-10500 ps4-11000 ps4-12000"
+            INSTALL="wine ps4-12000"
             ;;
         ps5)
-            INSTALL="wine ps5-8000 ps5-9000 ps5-10000"
+            INSTALL="wine ps5-10000"
             ;;
         nintendo)
-            INSTALL="wine nssdk-1532 nssdk-1753 nssdk-1832"
+            INSTALL="wine nssdk-1832"
             ;;
         android)
             INSTALL="android android-ndk25"
@@ -43,7 +43,7 @@ for request in $REQUESTED; do
             INSTALL="android $request"
             ;;
         windows)
-            INSTALL="wine winsdk-2019 winsdk-2022"
+            INSTALL="wine winsdk-2022"
             ;;
         linux)
             INSTALL="linux"
@@ -65,10 +65,10 @@ for request in $REQUESTED; do
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_NINTENDO_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 --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.4.0 -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 --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.5.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 --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.5.0 -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker
+            DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-android-env:1.6.0 -f $SCRIPT_DIR/docker/Dockerfile.android-env $SCRIPT_DIR/docker
             ;;
         android-ndk*|winsdk-*|emsdk-*)
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --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.android-env b/server/docker/Dockerfile.android-env
@@ -1,13 +1,13 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 # Technically part of the Android build, but also required by the GradleService.java
 # until it can be disabled (e.g. by looking for the existance of GRADLE_USER_HOME)
 
 # Versions: https://developer.android.com/studio/releases/gradle-plugin?buildsystem=ndk-build#updating-gradle
 # Java+Gradle version matrix: https://docs.gradle.org/current/userguide/compatibility.html
 ENV GRADLE_USER_HOME=/tmp/.gradle
-ENV GRADLE_VERSION=8.7
-ENV GRADLE_PLUGIN_VERSION=8.6.1
+ENV GRADLE_VERSION=9.1.0
+ENV GRADLE_PLUGIN_VERSION=8.13.0
 ENV PATH=${PATH}:/opt/gradle/gradle-${GRADLE_VERSION}/bin
 RUN \
   echo "Gradle" && \

diff --git a/server/docker/Dockerfile.android.ndk25-env b/server/docker/Dockerfile.android.ndk25-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-env:1.5.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-android-env:1.6.0
 
 #
 # Android SDK/NDK

diff --git a/server/docker/Dockerfile.base-env b/server/docker/Dockerfile.base-env
@@ -23,7 +23,7 @@ RUN \
 #
 # Java
 #
-ENV JAVA_HOME=/usr/local/jdk-21.0.5+11
+ENV JAVA_HOME=/usr/local/jdk-25+36
 ENV PATH=${JAVA_HOME}/bin:${PATH}
 
 RUN locale-gen en_US.UTF-8
@@ -35,7 +35,7 @@ ENV JDK_ARCH=${TARGETARCH/amd64/x64}
 ENV JDK_ARCH=${JDK_ARCH/arm64/aarch64}
 
 RUN \
-  wget -q -O - https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_${JDK_ARCH}_linux_hotspot_21.0.5_11.tar.gz | tar xz -C /usr/local && \
+  wget -q -O - https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25%2B36/OpenJDK25U-jdk_${JDK_ARCH}_linux_hotspot_25_36.tar.gz | tar xz -C /usr/local && \
   java -version && \
   javac -version
 

diff --git a/server/docker/Dockerfile.emsdk.2011-env b/server/docker/Dockerfile.emsdk.2011-env
diff --git a/server/docker/Dockerfile.emsdk.3155-env b/server/docker/Dockerfile.emsdk.3155-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 ENV EMSCRIPTEN_SDK_3_1_55=${PLATFORMSDK_DIR}/emsdk-3.1.55
 ENV EMSCRIPTEN_HOME_3_1_55=${EMSCRIPTEN_SDK_3_1_55}

diff --git a/server/docker/Dockerfile.emsdk.3165-env b/server/docker/Dockerfile.emsdk.3165-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 ENV EMSCRIPTEN_SDK_3_1_65=${PLATFORMSDK_DIR}/emsdk-3.1.65
 ENV EMSCRIPTEN_HOME_3_1_65=${EMSCRIPTEN_SDK_3_1_65}

diff --git a/server/docker/Dockerfile.emsdk.406-env b/server/docker/Dockerfile.emsdk.406-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 ENV EMSCRIPTEN_SDK_4_0_6=${PLATFORMSDK_DIR}/emsdk-4.0.6
 ENV EMSCRIPTEN_HOME_4_0_6=${EMSCRIPTEN_SDK_4_0_6}

diff --git a/server/docker/Dockerfile.linux-env b/server/docker/Dockerfile.linux-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 RUN \
   echo "LINUX TOOLS + COMPILER" && \

diff --git a/server/docker/Dockerfile.nssdk.1532-env b/server/docker/Dockerfile.nssdk.1532-env
diff --git a/server/docker/Dockerfile.nssdk.1753-env b/server/docker/Dockerfile.nssdk.1753-env
diff --git a/server/docker/Dockerfile.nssdk.1832-env b/server/docker/Dockerfile.nssdk.1832-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
 
 ENV NINTENDO_SDK_ROOT_18_3=${PLATFORMSDK_DIR}/nx-18.3.2
 ENV SWITCH_SDK_18_FILENAME=nx64-sdk-18.3.2.tar.gz

diff --git a/server/docker/Dockerfile.ps4.10500-env b/server/docker/Dockerfile.ps4.10500-env
diff --git a/server/docker/Dockerfile.ps4.11000-env b/server/docker/Dockerfile.ps4.11000-env
diff --git a/server/docker/Dockerfile.ps4.12000-env b/server/docker/Dockerfile.ps4.12000-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
 
 ENV PS4_SDK_VERSION=12.000
 ENV PS4_SDK=${PLATFORMSDK_DIR}/ps4-sdk-${PS4_SDK_VERSION}

diff --git a/server/docker/Dockerfile.ps5.10000-env b/server/docker/Dockerfile.ps5.10000-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
 
 ENV PS5_SDK_VERSION=10.000
 ENV PS5_SDK=${PLATFORMSDK_DIR}/ps5-sdk-${PS5_SDK_VERSION}

diff --git a/server/docker/Dockerfile.ps5.8000-env b/server/docker/Dockerfile.ps5.8000-env
diff --git a/server/docker/Dockerfile.ps5.9000-env b/server/docker/Dockerfile.ps5.9000-env
diff --git a/server/docker/Dockerfile.wine-env b/server/docker/Dockerfile.wine-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-base-env:1.5.0
 
 # Installation notes: https://wiki.winehq.org/Ubuntu
 # TODO: Backup the files as descibed here: https://wiki.winehq.org/Ubuntu

diff --git a/server/docker/Dockerfile.winsdk.2019-env b/server/docker/Dockerfile.winsdk.2019-env
diff --git a/server/docker/Dockerfile.winsdk.2022-env b/server/docker/Dockerfile.winsdk.2022-env
@@ -1,4 +1,4 @@
-FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.4.0
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-wine-env:1.5.0
 
 ENV PLATFORMSDK_WIN32=$PLATFORMSDK_DIR/Win32
 

diff --git a/server/src/main/resources/template.gradle.properties b/server/src/main/resources/template.gradle.properties
@@ -4,4 +4,4 @@ android.enableJetifier={{android-enable-jetifier}}
 # Gradle will stop resolving dependencies if android.useAndroidX is false and a dependency is using Android X
 android.useAndroidX={{android-enable-jetifier}}
 
-org.gradle.java.home=/usr/local/jdk-21.0.5+11
+org.gradle.java.home=/usr/local/jdk-25+36