mirror of
https://github.com/godotengine/build-containers.git
synced 2026-01-05 22:10:22 +03:00
Update Dockerfile.android
Updates based on feedback.
This commit is contained in:
committed by
GitHub
parent
5978e67f01
commit
c079413258
@@ -3,6 +3,9 @@ FROM godot-mono:${img_version}
|
|||||||
|
|
||||||
ARG mono_version
|
ARG mono_version
|
||||||
|
|
||||||
|
ENV ANDROID_NDK_VERSION=21.3.6528147
|
||||||
|
ENV ANDROID_SDK_ROOT=/root/sdk/
|
||||||
|
|
||||||
RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
|
RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mandatory!\n\n"; exit 1; fi && \
|
||||||
dnf -y install --setopt=install_weak_deps=False \
|
dnf -y install --setopt=install_weak_deps=False \
|
||||||
java-1.8.0-openjdk-devel ncurses-compat-libs && \
|
java-1.8.0-openjdk-devel ncurses-compat-libs && \
|
||||||
@@ -11,9 +14,9 @@ RUN if [ -z "${mono_version}" ]; then echo -e "\n\nargument mono-version is mand
|
|||||||
unzip commandlinetools-linux-6609375_latest.zip && \
|
unzip commandlinetools-linux-6609375_latest.zip && \
|
||||||
rm commandlinetools-linux-6609375_latest.zip && \
|
rm commandlinetools-linux-6609375_latest.zip && \
|
||||||
yes | tools/bin/sdkmanager --licenses && \
|
yes | tools/bin/sdkmanager --licenses && \
|
||||||
tools/bin/sdkmanager 'cmdline-tools;latest' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404'
|
tools/bin/sdkmanager --sdk_root="${ANDROID_SDK_ROOT}" 'ndk;${ANDROID_NDK_VERSION}' 'cmdline-tools;latest' 'build-tools;30.0.1' 'platforms;android-30' 'cmake;3.10.2.4988404'
|
||||||
|
|
||||||
ENV ANDROID_SDK_ROOT=/root/sdk/
|
ENV ANDROID_NDK_ROOT=${ANDROID_SDK_ROOT}/ndk/${ANDROID_NDK_VERSION}
|
||||||
|
|
||||||
RUN cp -a /root/files/${mono_version} /root && \
|
RUN cp -a /root/files/${mono_version} /root && \
|
||||||
export MONO_SOURCE_ROOT=/root/${mono_version} && \
|
export MONO_SOURCE_ROOT=/root/${mono_version} && \
|
||||||
|
|||||||
Reference in New Issue
Block a user