Add dind feature to devcontainer to seperate envs (#4)

hacs · Jun 19, 2024 · f33bbf2 · f33bbf2
1 parent b1956f2
commit f33bbf2
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 13 deletions.
diff --git a/.devcontainer.json b/.devcontainer.json
@@ -1,29 +1,41 @@
 {
     "name": "hacs/addons",
     "image": "ghcr.io/home-assistant/devcontainer:addons",
-    "appPort": [
-        "7123:8123",
-        "7357:4357"
-    ],
-    "postStartCommand": "bash devcontainer_bootstrap",
-    "runArgs": [
-        "-e",
-        "GIT_EDITOR=code --wait",
-        "--privileged"
+    "forwardPorts": [
+        8123,
+        4357
     ],
+    "portsAttributes": {
+        "4357": {
+            "label": "Home Assistant Observer"
+        },
+        "8123": {
+            "label": "Home Assistant UI"
+        }
+    },
+    "postStartCommand": "bash script/setup",
     "remoteUser": "root",
     "containerEnv": {
         "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
     },
+    "mounts": [
+        {
+            "source": "hacs-addon-dind-var-lib-docker",
+            "target": "/var/lib/docker",
+            "type": "volume"
+        },
+        {
+            "source": "hacs-addon-supervisor-data",
+            "target": "/supervisor_data",
+            "type": "volume"
+        }
+    ],
     "customizations": {
         "vscode": {
             "extensions": [
                 "timonwong.shellcheck",
                 "esbenp.prettier-vscode"
             ],
-            "mounts": [
-                "type=volume,target=/var/lib/docker"
-            ],
             "settings": {
                 "terminal.integrated.profiles.linux": {
                     "zsh": {
@@ -37,5 +49,8 @@
                 "files.trimTrailingWhitespace": true
             }
         }
+    },
+    "features": {
+        "ghcr.io/devcontainers/features/docker-in-docker:2": {}
     }
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "Start Home Assistant",
             "type": "shell",
-            "command": "supervisor_run",
+            "command": "bash script/develop",
             "group": {
                 "kind": "test",
                 "isDefault": true

diff --git a/script/develop b/script/develop
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bash supervisor_run
diff --git a/script/setup b/script/setup
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+mkdir -p /tmp
+ln -sf /supervisor_data /tmp/supervisor_data
+
+bash devcontainer_bootstrap