From 8bdc6f987b0115334528a29dfb9df8124a21f293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cu=CC=9Bo=CC=9Bng=20Nguye=CC=82=CC=83n?= Date: Mon, 4 Sep 2023 08:34:39 +0700 Subject: [PATCH] 4.2 beta6 --- Dockerfile | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index f982aa2..8196f14 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,21 +4,16 @@ WORKDIR /files RUN apk add -U unzip -ARG GODOT_VERSION="4.1.1" -ARG RELEASE_NAME="stable" +ARG GODOT_VERSION="4.2" +ARG RELEASE_NAME="beta6" -# This is only needed for non-stable builds (alpha, beta, RC) -# e.g. SUBDIR "/beta3" -# Use an empty string "" when the RELEASE_NAME is "stable" -ARG SUBDIR "" - -RUN wget -O /tmp/godot.zip https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}${SUBDIR}/mono/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux_x86_64.zip +RUN wget -O /tmp/godot.zip https://github.com/godotengine/godot-builds/releases/download/${GODOT_VERSION}-${RELEASE_NAME}/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux_x86_64.zip RUN unzip /tmp/godot.zip -d /tmp/godot RUN mkdir -p godot RUN mv /tmp/godot/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux_x86_64/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux.x86_64 /tmp/godot/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux_x86_64/godot RUN mv /tmp/godot/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_linux_x86_64/* /files/godot -RUN wget -O /tmp/godot_templates.tpz https://downloads.tuxfamily.org/godotengine/${GODOT_VERSION}${SUBDIR}/mono/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_export_templates.tpz +RUN wget -O /tmp/godot_templates.tpz https://github.com/godotengine/godot-builds/releases/download/${GODOT_VERSION}-${RELEASE_NAME}/Godot_v${GODOT_VERSION}-${RELEASE_NAME}_mono_export_templates.tpz RUN unzip /tmp/godot_templates.tpz -d /tmp/godot_templates RUN mkdir -p templates/${GODOT_VERSION}.${RELEASE_NAME}.mono RUN mv /tmp/godot_templates/templates/* /files/templates/${GODOT_VERSION}.${RELEASE_NAME}.mono @@ -27,12 +22,12 @@ RUN wget -O /tmp/android_sdk.zip https://dl.google.com/android/repository/comman RUN unzip /tmp/android_sdk.zip -d /tmp/android_sdk RUN mv /tmp/android_sdk/* /files -FROM mcr.microsoft.com/dotnet/sdk:7.0.400-jammy-amd64 +FROM mcr.microsoft.com/dotnet/sdk:8.0.100-jammy-amd64 USER root -ARG ANDROID_COMPILE_SDK=32 -ARG ANDROID_BUILD_TOOLS=32.0.0 +ARG ANDROID_COMPILE_SDK=33 +ARG ANDROID_BUILD_TOOLS=33.0.2 RUN apt-get update && apt-get install -y --no-install-recommends openjdk-11-jdk-headless && rm -rf /var/lib/apt/lists/* /tmp/*