From da29e519934fa7d70fbc78c60f8cf26eea5c51e0 Mon Sep 17 00:00:00 2001
From: kfj001 <kfj001@gmail.com>
Date: Mon, 22 Jun 2026 23:20:44 +0000
Subject: [PATCH] stable, alpine based devcontainer

---
 .devcontainer/Dockerfile        | 50 +++++++++++++++++----------------
 .devcontainer/devcontainer.json |  4 ++-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index aff0e9d..15cb133 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,31 +1,33 @@
-FROM mcr.microsoft.com/devcontainers/java:dev-17-jdk-trixie
+FROM ghcr.io/alvr/alpine-android:android-34-jdk21
 
 # Install Android SDK command-line tools
 # ARG ANDROID_CMDLINE_TOOLS_VERSION=11076708
-ARG ANDROID_BUILD_TOOLS_VERSION=34.0.0
-ARG ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
+# ARG ANDROID_BUILD_TOOLS_VERSION=34.0.0
+# ARG ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip"
 
-RUN mkdir -p /usr/local/android-sdk/cmdline-tools && \
-    cd /tmp && \
-    curl -fsSL "$ANDROID_SDK_URL" -o cmdline-tools.zip && \
-    unzip -q cmdline-tools.zip -d /usr/local/android-sdk/cmdline-tools && \
-    mv /usr/local/android-sdk/cmdline-tools/cmdline-tools /usr/local/android-sdk/cmdline-tools/latest && \
-    rm cmdline-tools.zip
+# RUN apk update && apk add curl zip git openjdk21-jdk cmake gcc
 
-# Set Android SDK paths and environment
-ENV ANDROID_HOME=/usr/local/android-sdk
-ENV ANDROID_COMMAND_LINE_TOOL=/usr/local/android-sdk/cmdline-tools/latest/bin
-ENV PATH=${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}
+#  RUN mkdir -p /usr/local/android-sdk/cmdline-tools && \
+#     cd /tmp && \
+#     curl -fsSL "$ANDROID_SDK_URL" -o cmdline-tools.zip && \
+#     unzip -q cmdline-tools.zip -d /usr/local/android-sdk/cmdline-tools && \
+#     mv /usr/local/android-sdk/cmdline-tools/cmdline-tools /usr/local/android-sdk/cmdline-tools/latest && \
+#     rm cmdline-tools.zip
 
-# Accept licenses and install required SDK packages
-RUN mkdir -p $ANDROID_HOME/.android && \
-    touch $ANDROID_HOME/.android/repositories.cfg && \
-    yes | ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager --licenses 2>/dev/null || true && \
-    ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager \
-    "platforms;android-34" \
-    "build-tools;33.0.1" \
-    "platform-tools" \
-    2>&1 | tee /dev/null
+# # Set Android SDK paths and environment
+# ENV ANDROID_HOME=/usr/local/android-sdk
+# ENV ANDROID_COMMAND_LINE_TOOL=/usr/local/android-sdk/cmdline-tools/latest/bin
+# ENV PATH=${ANDROID_HOME}/cmdline-tools/latest/bin:${ANDROID_HOME}/platform-tools:${PATH}
 
-# Grant execute permission to gradlew
-RUN chmod +x /workspaces/*/gradlew 2>/dev/null || true
+# # Accept licenses and install required SDK packages
+# RUN mkdir -p $ANDROID_HOME/.android && \
+#     touch $ANDROID_HOME/.android/repositories.cfg && \
+#     yes | ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager --licenses 2>/dev/null || true && \
+#     ${ANDROID_COMMAND_LINE_TOOL}/sdkmanager \
+#     "platforms;android-34" \
+#     "build-tools;33.0.1" \
+#     "platform-tools" \
+#     2>&1 | tee /dev/null
+
+# # Grant execute permission to gradlew
+# RUN chmod +x /workspaces/*/gradlew 2>/dev/null || true
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5169cae..31f5989 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,7 +7,9 @@
                 "redhat.vscode-xml",
                 "redhat.vscode-yaml",
                 "felipecaslazana.vscode-android-logcat",
-                "ms-azuretools.vscode-docker"
+                "ms-azuretools.vscode-docker",
+                "fwcd.kotlin",
+                "vscjava.vscode-java-pack"
             ]
         }
     },