fix docker for tauri app
This commit is contained in:
@@ -3,8 +3,6 @@ FROM ghcr.io/cirruslabs/android-sdk:35
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
ENV ANDROID_HOME=/opt/android-sdk
|
||||
ENV ANDROID_SDK_ROOT=/opt/android-sdk
|
||||
ENV ANDROID_NDK_HOME=/opt/android-sdk/ndk/27.0.12077973
|
||||
ENV NDK_HOME=/opt/android-sdk/ndk/27.0.12077973
|
||||
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
|
||||
ENV PATH=/root/.cargo/bin:/opt/android-sdk/cmdline-tools/latest/bin:/opt/android-sdk/platform-tools:/usr/local/bin:$PATH
|
||||
|
||||
@@ -23,20 +21,16 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN if [ ! -d "${ANDROID_HOME}" ] && [ -d /opt/android-sdk-linux ]; then ln -s /opt/android-sdk-linux "${ANDROID_HOME}"; fi \
|
||||
&& sdkmanager --version
|
||||
&& (sdkmanager --version || true) \
|
||||
&& test -d "${ANDROID_HOME}/platforms" \
|
||||
&& test -d "${ANDROID_HOME}/build-tools" \
|
||||
&& test -d "${ANDROID_HOME}/platform-tools"
|
||||
|
||||
RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
|
||||
&& apt-get update \
|
||||
&& apt-get install -y --no-install-recommends nodejs \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
RUN yes | sdkmanager --licenses >/dev/null || true \
|
||||
&& sdkmanager \
|
||||
"platform-tools" \
|
||||
"platforms;android-35" \
|
||||
"build-tools;35.0.0" \
|
||||
"ndk;27.0.12077973"
|
||||
|
||||
RUN curl --proto '=https' --tlsv1.2 -fsSL https://sh.rustup.rs | sh -s -- -y --profile minimal \
|
||||
&& rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android x86_64-linux-android
|
||||
|
||||
|
||||
Reference in New Issue
Block a user