Update Dockerfile

Dockerfile

@@ -1,50 +1,63 @@
 FROM ubuntu:22.04
 
+# 1. Environment Variables
 ENV DEBIAN_FRONTEND=noninteractive
 ENV PUB_CACHE=/home/user/.pub-cache
-ENV ANDROID_HOME=/opt/android-sdk
-ENV ANDROID_SDK_ROOT=$ANDROID_HOME
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
-ENV PATH="/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/platform-tools:$JAVA_HOME/bin:${PATH}"
+ENV ANDROID_SDK_ROOT=/opt/android-sdk
+# Merged PATH for Flutter, Dart, and Android Tools
+ENV PATH="/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/platform-tools:${PATH}"
 
-# Install system dependencies
+# 2. Install System Dependencies
 RUN apt-get update && apt-get install -y \
-    curl git unzip xz-utils zip libglu1-mesa \
-    python3 python3-pip wget openjdk-17-jdk \
-    libc6 libncurses5 libstdc++6 lib32z1 libbz2-1.0 \
+    curl git unzip xz-utils zip libglu1-mesa python3 python3-pip wget openjdk-17-jdk \
     && rm -rf /var/lib/apt/lists/*
 
-# Install code-server
+# 3. Install code-server
 RUN curl -fsSL https://code-server.dev/install.sh | sh
 
-# Install Flutter
-RUN git clone https://github.com/flutter/flutter.git -b stable /opt/flutter
+# 4. Install Flutter SDK
+RUN git clone https://github.com/flutter/flutter.git /opt/flutter
 
-# Install Android Command Line Tools
-RUN mkdir -p $ANDROID_HOME/cmdline-tools && \
-    cd $ANDROID_HOME/cmdline-tools && \
-    wget -q https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O cmdline-tools.zip && \
-    unzip -q cmdline-tools.zip && \
-    mv cmdline-tools latest && \
-    rm cmdline-tools.zip
+# 5. Install Android SDK Command Line Tools
+# Note: Using version 11076708 (adjust if a newer version is required)
+RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools && \
+    wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip -O /tmp/tools.zip && \
+    unzip /tmp/tools.zip -d ${ANDROID_SDK_ROOT}/cmdline-tools && \
+    mv ${ANDROID_SDK_ROOT}/cmdline-tools/cmdline-tools ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
+    rm /tmp/tools.zip
 
-# Accept Android licenses non-interactively
-RUN yes | flutter doctor --android-licenses 2>/dev/null || true
-
-# Create user and set permissions
+# 6. Setup User and Permissions
 RUN useradd -m -u 1000 user && \
-    chown -R user:user /opt/flutter $ANDROID_HOME /home/user
+    chown -R user:user /opt/flutter && \
+    chown -R user:user ${ANDROID_SDK_ROOT}
 
 USER user
 WORKDIR /home/user
 
-# Pre-cache Flutter artifacts and run doctor
-RUN flutter precache --android && \
-    flutter doctor -v
-
+# 7. Configure Android SDK & Licenses
+# Accepts all licenses and installs basic platform tools
+RUN yes | sdkmanager --licenses && \
+    sdkmanager "platform-tools" "platforms;android-34" "build-tools;34.0.0"
+
+# 8. Activate Flutter and Extensions
+RUN flutter config --android-sdk ${ANDROID_SDK_ROOT} && \
+    flutter precache && \
+    flutter doctor && \
+    code-server --install-extension dart-code.flutter && \
+    code-server --install-extension dart-code.dart-code
+
+# 9. Optional: Pre-configure VS Code Settings
+RUN mkdir -p /home/user/.local/share/code-server/User && \
+    echo '{ \
+    "dart.flutterSdkPath": "/opt/flutter", \
+    "dart.sdkPath": "/opt/flutter/bin/cache/dart-sdk", \
+    "python.defaultInterpreterPath": "/usr/bin/python3" \
+    }' > /home/user/.local/share/code-server/User/settings.json
+
+# 10. Final Setup
 COPY --chown=user requirements.txt .
-RUN pip3 install --no-cache-dir -r requirements.txt
+RUN pip3 install --no-cache-dir -r requirements.txt || echo "No requirements.txt found, skipping..."
 
 EXPOSE 7860
 
-CMD ["code-server", "--bind-addr", "0.0.0.0:7860", "--auth", "none", "."]
+CMD ["code-server", "--bind-addr", "0.0.0.0:7860", "--auth", "none", "."]