Update devcontainer image and fix permission issues

.devcontainer/devcontainer.json

@@ -2,13 +2,11 @@
     "name": "flutter_docker",
     "context": "..",
     "dockerFile": "../.docker/android-dev.dockerfile",
-    "remoteUser": "mobiledevops",
-    "settings": {
-        "terminal.integrated.shell.linux": null
-    },
+    "remoteUser": "komodo",
+    "postAttachCommand": "sh .docker/dev-setup.sh",
     "runArgs": [
         "--privileged"
     ],
-    "workspaceMount": "source=${localWorkspaceFolder},target=/home/mobiledevops/workspace,type=bind,consistency=delegated",
-    "workspaceFolder": "/home/mobiledevops/workspace"
+    "workspaceMount": "source=${localWorkspaceFolder},target=/home/komodo/workspace,type=bind,consistency=delegated",
+    "workspaceFolder": "/home/komodo/workspace"
 }

.docker/android-apk-build.dockerfile

@@ -7,7 +7,6 @@ RUN apt update && \
 
 WORKDIR /app
 
-# TODO: add .dockerignore
 COPY . .
 
 # TODO: add .gitkeep files for the missing directories 

.docker/android-dev.dockerfile

@@ -1,26 +1,28 @@
-FROM mobiledevops/android-sdk-image:34.0.0-jdk17 as final
+FROM --platform=linux/amd64 ghcr.io/cirruslabs/android-sdk:34 as final
 
 ENV FLUTTER_VERSION="2.8.1"
-ENV FLUTTER_HOME "/home/mobiledevops/.flutter-sdk"
-ENV USER="mobiledevops"
+ENV FLUTTER_HOME "/home/komodo/.flutter-sdk"
+ENV USER="komodo"
 ENV PATH $PATH:$FLUTTER_HOME/bin
 
+RUN apt update && apt install -y python3 python3-pip python3-venv && \
+    python3 -m venv /home/komodo/.venv && \
+    useradd -u 1001 -m $USER && \
+    usermod -aG sudo $USER && \
+    echo "$USER ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
+    chown -R $USER:$USER /home/$USER
+
+USER $USER
+
 # Download and extract Flutter SDK
-RUN mkdir $FLUTTER_HOME \
+RUN mkdir -p /home/komodo/workspace \
+    && chown -R $USER:$USER /home/komodo/workspace \
+    && mkdir -p $FLUTTER_HOME \
     && cd $FLUTTER_HOME \
     && curl --fail --remote-time --silent --location -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}-stable.tar.xz \
     && tar xf flutter_linux_${FLUTTER_VERSION}-stable.tar.xz --strip-components=1 \
-    && rm flutter_linux_${FLUTTER_VERSION}-stable.tar.xz
-
-ENV ANDROID_HOME "/opt/android-sdk-linux"
-ENV ANDROID_SDK_ROOT $ANDROID_HOME
-ENV PATH $PATH:$ANDROID_HOME/cmdline-tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools
-
-RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_ROOT} --update && \
-    sdkmanager --install "cmdline-tools;latest" --sdk_root=${ANDROID_SDK_ROOT} && \
-    sdkmanager --install "platform-tools" --sdk_root=${ANDROID_SDK_ROOT}    
-
-RUN flutter config --no-analytics --android-sdk=$ANDROID_HOME \
+    && rm flutter_linux_${FLUTTER_VERSION}-stable.tar.xz \
+    && flutter config --no-analytics  \
     && flutter precache \
     && yes "y" | flutter doctor --android-licenses \
     && flutter doctor \

.docker/dev-setup.sh

@@ -0,0 +1,5 @@
+chmod u+rw,g+r komodo:komodo /home/komodo/workspace
+mkdir -p android/app/src/main/cpp/libs/armeabi-v7a
+mkdir -p android/app/src/main/cpp/libs/arm64-v8a
+/home/komodo/.venv/bin/pip install -r .docker/requirements.txt 
+/home/komodo/.venv/bin/python .docker/update_api.py

README.md

@@ -77,6 +77,8 @@ docker build -f .docker/android-apk-build.dockerfile . -t mobile_apk_build
 docker run --rm -u 1001:1001 -v ./build:/app/build mobile_apk_build:latest
 ```
 
+The build output should be in the following directory: `build/app/outputs/flutter-apk/app-release.apk`
+
 ## Run/Build with screenshot and video recording ON
 
 ```