Update Dockerfile

Dockerfile

@@ -1,44 +1,58 @@
-# 基于官方的Ubuntu镜像
+# 使用Ubuntu作为基础镜像
 FROM ubuntu:20.04
- 
-# 安装所需的依赖
+
+# 避免交互式提示
+ENV DEBIAN_FRONTEND=noninteractive
+
+# 设置环境变量
+ENV ANDROID_HOME=/opt/android-sdk
+ENV ANDROID_SDK_ROOT=$ANDROID_HOME
+ENV PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/cmdline-tools/latest/bin
+
+# 安装必要的包
 RUN apt-get update && apt-get install -y \
-    curl \
-    git \
+    wget \
+    unzip \
     openjdk-11-jdk \
-    python3 \
-    python3-pip \
-    unzip
- 
-# 设置环境变量
-ENV ANDROID_SDK_ROOT /root/android-sdk \
-    ANDROID_HOME /root/android-sdk \
-    ANDROID_NDK_ROOT /root/android-ndk-r21e \
-    ANDROID_SDK_TOOLS_VERSION 7355738 \
-    JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64
- 
-# 下载Android SDK和工具
-RUN mkdir -p /root/android-sdk-tools \
-    && curl -fsSL https://dl.google./android/repository/commandlinetools-linux-7355738_latest.zip -o commandlinetools.zip \
-    && unzip -q commandlinetools.zip -d /root/android-sdk-tools \
-    && rm commandlinetools.zip \
-    && curl -fsSL https://dl.google.com/android/repository/sdk-tools-linux-7355738.zip -o sdk-tools.zip \
-    && unzip -q sdk-tools.zip -d /root/android-sdk-tools \
-    && rm sdk-tools.zip \
-    && mv /root/android-sdk-tools/cmdline-tools/latest/cmdline-tools /root/android-sdk-tools \
-    && rm -rf /root/android-sdk-tools/cmdline-tools
- 
-# 设置PATH环境变量
-ENV PATH $ANDROID_SDK_ROOT/tools/bin:$PATH
- 
+    git \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# 创建Android SDK目录
+RUN mkdir -p ${ANDROID_HOME}/cmdline-tools
+
+# 下载Android命令行工具
+RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip -O cmdline-tools.zip \
+    && unzip cmdline-tools.zip -d ${ANDROID_HOME}/cmdline-tools \
+    && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
+    && rm cmdline-tools.zip
+
+# 接受许可
+RUN yes | sdkmanager --licenses
+
 # 安装Android SDK组件
-RUN yes | /root/android-sdk-tools/bin/sdkmanager --sdk_root=/root/android-sdk "platform-tools" "platforms;android-29"
- 
+RUN sdkmanager \
+    "platform-tools" \
+    "platforms;android-30" \
+    "build-tools;30.0.3" \
+    "extras;android;m2repository" \
+    "extras;google;m2repository"
+
 # 设置工作目录
-WORKDIR /root/android-sdk-tools
- 
-# 设置用户
-USER developer
- 
-# 默认命令
-CMD ["/bin/bash"]
+WORKDIR /app
+
+# 添加Gradle包装器
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle .
+COPY settings.gradle .
+COPY app app
+
+# 给予Gradle包装器执行权限
+RUN chmod +x ./gradlew
+
+# 预下载依赖
+RUN ./gradlew --no-daemon dependencies
+
+# 设置默认命令
+CMD ["./gradlew", "assembleDebug"]