Update Dockerfile

Dockerfile

@@ -2,6 +2,10 @@ FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 ENV HOSTNAME=xro
+ENV ANDROID_SDK_ROOT=/opt/android-sdk
+ENV ANDROID_HOME=/opt/android-sdk
+ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:/opt/android-studio/bin
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
 
 # -----------------------------
 # Base packages
@@ -25,22 +29,18 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 # -----------------------------
-# Android SDK
+# Android SDK cmdline-tools
 # -----------------------------
 RUN mkdir -p /opt/android-sdk/cmdline-tools && \
-    wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip && \
+    wget -t 5 -T 30 -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/cmdtools.zip && \
     unzip /tmp/cmdtools.zip -d /opt/android-sdk/cmdline-tools && \
     mv /opt/android-sdk/cmdline-tools/cmdline-tools /opt/android-sdk/cmdline-tools/latest && \
     rm /tmp/cmdtools.zip
 
-ENV ANDROID_HOME=/opt/android-sdk
-ENV ANDROID_SDK_ROOT=/opt/android-sdk
-ENV PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools
-
-# Accept all SDK licenses
+# Accept SDK licenses
 RUN yes | sdkmanager --licenses
 
-# Install SDKs including old ones for ARM support
+# Install SDK + old platforms for ARM/legacy devices
 RUN sdkmanager \
     "platform-tools" \
     "platforms;android-34" \
@@ -59,19 +59,17 @@ RUN sdkmanager \
 # -----------------------------
 # Android Studio
 # -----------------------------
-RUN wget -q https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz -O /tmp/android-studio.tar.gz && \
+RUN wget -t 5 -T 30 -q https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2023.3.1.18/android-studio-2023.3.1.18-linux.tar.gz -O /tmp/android-studio.tar.gz && \
     tar -xzf /tmp/android-studio.tar.gz -C /opt/ && \
     rm /tmp/android-studio.tar.gz
 
-ENV PATH=$PATH:/opt/android-studio/bin
-
 # -----------------------------
-# Install Projector (headless IDE server)
+# Projector installer
 # -----------------------------
 RUN pip install projector-installer
 
-# Install Android Studio via Projector in non-interactive mode
-RUN projector install android-studio --ide Idea_Community --quick --accept-license
+# Install Android Studio in Projector non-interactive mode
+RUN printf "y\n" | projector install android-studio --ide Idea_Community --quick --accept-license
 
 # -----------------------------
 # Workspace