Change devcontainer to docker-compose format

Use local tagged image instead of the 3rd party image
KomodoPlatform · May 23, 2024 · 95ce8bf · 95ce8bf
1 parent 7022813
commit 95ce8bf
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,12 +1,8 @@
 {
     "name": "flutter_docker",
-    "context": "..",
-    "dockerFile": "../.docker/android-dev.dockerfile",
+    "dockerComposeFile": "../.docker/docker-compose.yml",
+    "service": "komodo-wallet-mobile",
     "remoteUser": "komodo",
     "postAttachCommand": "sh .docker/dev-setup.sh",
-    "runArgs": [
-        "--privileged"
-    ],
-    "workspaceMount": "source=${localWorkspaceFolder},target=/home/komodo/workspace,type=bind,consistency=delegated",
     "workspaceFolder": "/home/komodo/workspace"
 }
diff --git a/.docker/android-dev.dockerfile b/.docker/android-dev.dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/cirruslabs/android-sdk:34 as final
+FROM komodo/android-sdk:34 as final
 
 ENV FLUTTER_VERSION="2.8.1"
 ENV FLUTTER_HOME "/home/komodo/.flutter-sdk"

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
@@ -0,0 +1,17 @@
+services:
+  android-sdk:
+    build:
+      context: ..
+      dockerfile: .docker/android-sdk.dockerfile
+    image: komodo/android-sdk:34
+
+  komodo-wallet-mobile:
+    build:
+      context: ..
+      dockerfile: .docker/android-dev.dockerfile
+    image: komodo/komodo-wallet-mobile
+    volumes:
+      - ../:/home/komodo/workspace
+    depends_on:
+      - android-sdk
+    command: "/bin/sh -c 'while true; do sleep 1000; done'"