godotengine/build-containers
1
0
Fork 0
mirror of https://github.com/godotengine/build-containers.git synced 2026-01-04 18:10:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from godotengine/4.3-toolchains-update-2

Browse Source 
Redo .NET 8.0, SCons 4.6.0, and Android API 34 updates lost in #138
This commit is contained in:
Rémi Verschelde
2024-02-08 17:30:46 +01:00
committed by GitHub
parent 032ba1bc42 ffa2f1a5d7
commit 41400a8922
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.android
View File

@@ -8,11 +8,11 @@ ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}
RUN dnf -y install --setopt=install_weak_deps=False \ RUN dnf -y install --setopt=install_weak_deps=False \
java-17-openjdk-devel ncurses-compat-libs && \ java-17-openjdk-devel ncurses-compat-libs && \
mkdir -p sdk && cd sdk && \ mkdir -p sdk && cd sdk && \
export CMDLINETOOLS=commandlinetools-linux-10406996_latest.zip && \ export CMDLINETOOLS=commandlinetools-linux-11076708_latest.zip && \
curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \ curl -LO https://dl.google.com/android/repository/${CMDLINETOOLS} && \
unzip ${CMDLINETOOLS} && \ unzip ${CMDLINETOOLS} && \
rm ${CMDLINETOOLS} && \ rm ${CMDLINETOOLS} && \
yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \ yes | cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" --licenses && \
cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;33.0.2' 'platforms;android-33' 'cmake;3.22.1' cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" "ndk;${ANDROID_NDK_VERSION}" 'cmdline-tools;latest' 'build-tools;34.0.0' 'platforms;android-34' 'cmake;3.22.1'
CMD /bin/bash CMD /bin/bash

4
Dockerfile.base
View File

@@ -7,7 +7,7 @@ ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
RUN dnf -y install --setopt=install_weak_deps=False \ RUN dnf -y install --setopt=install_weak_deps=False \
bash bzip2 curl file findutils gettext git make nano patch pkgconfig python3-pip unzip which xz \ bash bzip2 curl file findutils gettext git make nano patch pkgconfig python3-pip unzip which xz \
dotnet-sdk-6.0 && \ dotnet-sdk-8.0 && \
pip install scons==4.5.2 pip install scons==4.6.0
CMD /bin/bash CMD /bin/bash