Update Dockerfile

Dockerfile

@@ -3,97 +3,134 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 ENV HOSTNAME=xro
 
-# ---- Base packages ----
-RUN apt-get update && apt-get install -y \
-    ca-certificates \
-    curl \
-    wget \
-    git \
-    sudo \
-    htop \
-    btop \
-    neovim \
-    nano \
-    lsof \
-    tmux \
-    screen \
-    unzip \
-    zip \
-    python3 \
-    python3-pip \
-    libxtst6 \
-    libxrender1 \
-    libxi6 \
-    libxext6 \
-    libx11-6 \
-    libxrandr2 \
-    libxfixes3 \
-    libxcursor1 \
-    libxcomposite1 \
-    libxdamage1 \
-    libxss1 \
-    libglib2.0-0 \
-    libgtk-3-0 \
-    libatk1.0-0 \
-    fonts-dejavu \
-    fonts-liberation \
-    xvfb \
-    x11vnc \
-    novnc \
-    websockify \
-    openbox \
-    xterm \
-    openjdk-17-jdk \
-    gradle \
-    && rm -rf /var/lib/apt/lists/*
-
-# ---- Android SDK ----
-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 && \
-    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
+# -----------------------------
+
+# Base packages
+
+# -----------------------------
+
+RUN apt-get update && apt-get install -y 
+ca-certificates 
+curl 
+wget 
+git 
+sudo 
+htop 
+btop 
+neovim 
+nano 
+lsof 
+tmux 
+screen 
+unzip 
+zip 
+python3 
+python3-pip 
+libxtst6 
+libxrender1 
+libxi6 
+libxext6 
+libx11-6 
+libxrandr2 
+libxfixes3 
+libxcursor1 
+libxcomposite1 
+libxdamage1 
+libxss1 
+libglib2.0-0 
+libgtk-3-0 
+libatk1.0-0 
+fonts-dejavu 
+fonts-liberation 
+xvfb 
+x11vnc 
+novnc 
+websockify 
+openbox 
+xterm 
+openjdk-17-jdk 
+gradle 
+&& rm -rf /var/lib/apt/lists/*
+
+# -----------------------------
+
+# Android SDK
+
+# -----------------------------
+
+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 && 
+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
 
-# ---- Full SDK install ----
-RUN yes | sdkmanager --licenses && \
-    sdkmanager \
-    "platform-tools" \
-    "platforms;android-34" \
-    "platforms;android-33" \
-    "platforms;android-32" \
-    "platforms;android-31" \
-    "platforms;android-30" \
-    "platforms;android-29" \
-    "platforms;android-28" \
-    "build-tools;34.0.0" \
-    "build-tools;33.0.2" \
-    "build-tools;32.0.0" \
-    "build-tools;31.0.0" \
-    "build-tools;30.0.3" \
-    "sources;android-34" \
-    "sources;android-33" \
-    "extras;android;m2repository" \
-    "extras;google;m2repository" \
-    "extras;google;google_play_services" \
-    "cmake;3.22.1" \
-    "ndk;25.2.9519653" \
-    "ndk;26.1.10909125"
-
-# ---- 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 && \
-    tar -xzf /tmp/android-studio.tar.gz -C /opt/ && \
-    rm /tmp/android-studio.tar.gz
+# -----------------------------
+
+# Accept licenses
+
+# -----------------------------
+
+RUN yes | sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --licenses
+
+# -----------------------------
+
+# Install SDKs (NEW + OLD)
+
+# -----------------------------
+
+RUN sdkmanager 
+"platform-tools" 
+
+"platforms;android-34" 
+"platforms;android-33" 
+"platforms;android-30" 
+"platforms;android-29" 
+"platforms;android-28" 
+"platforms;android-26" 
+"platforms;android-24" 
+"platforms;android-23" 
+"platforms;android-21" 
+
+"build-tools;34.0.0" 
+"build-tools;33.0.2" 
+"build-tools;30.0.3" 
+"build-tools;29.0.3" 
+"build-tools;28.0.3" 
+
+"sources;android-34" 
+"sources;android-30" 
+
+"cmake;3.22.1" 
+
+"ndk;26.1.10909125" 
+"ndk;23.2.8568313" 
+"ndk;21.4.7075529"
+
+# -----------------------------
+
+# 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 && 
+tar -xzf /tmp/android-studio.tar.gz -C /opt/ && 
+rm /tmp/android-studio.tar.gz
 
 ENV PATH=$PATH:/opt/android-studio/bin
 
-# ---- noVNC index fix ----
-RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html 2>/dev/null || true
+# -----------------------------
+
+# noVNC fix
+
+# -----------------------------
+
+RUN ln -s /usr/share/novnc/vnc.html /usr/share/novnc/index.html || true
 
 WORKDIR /workspace
 
@@ -102,4 +139,4 @@ RUN chmod +x /start.sh
 
 EXPOSE 7860
 
-CMD ["/start.sh"]
+CMD ["/start.sh"]