From e45b281b53b73eb84bf72ac5667c0f703489be36 Mon Sep 17 00:00:00 2001
From: Felipe Santos <felipecassiors@gmail.com>
Date: Thu, 12 Sep 2024 16:29:17 +0000
Subject: [PATCH] Switch back to original container

---
 .devcontainer/Dockerfile               | 15 ++++++++++-----
 .devcontainer/devcontainer.json        | 15 ++++++++++++---
 .devcontainer/frigate-hass-integration |  2 +-
 .vscode/tasks.json                     |  5 ++++-
 docker-compose.yml                     |  9 ++++-----
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index aaa78bf0..32df1809 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,11 @@
-FROM ghcr.io/felipecrs/devcontainer:2
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
 
-RUN --mount=type=bind,source=package.json,target=/tmp/package.json \
-  retry --tries 3 --sleep 15s -- volta install \
-  "node@$(jq -er .volta.node /tmp/package.json)" \
-  "yarn@$(jq -er .volta.yarn /tmp/package.json)"
+USER vscode
+
+# Install Volta
+ARG HOME="/home/vscode"
+ENV VOLTA_HOME="${HOME}/.volta"
+ENV PATH="${VOLTA_HOME}/bin:${PATH}"
+RUN bash -c "$(curl -fsSL https://get.volta.sh)" -- --skip-setup
+
+CMD ["sleep", "infinity"]
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6725e351..7c51330b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,8 +1,16 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
   "dockerComposeFile": "../docker-compose.yml",
-  "service": "dev",
+  "service": "devcontainer",
+  "features": {
+    "ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
+      "moby": false
+    }
+  },
+  "updateRemoteUserUID": true,
   "workspaceFolder": "${localWorkspaceFolder}",
+  "initializeCommand": [".devcontainer/initialize.sh"],
+  "postCreateCommand": ["yarn", "install"],
   "forwardPorts": [10001, "hass:8123", "frigate:5000"],
   "portsAttributes": {
     "10001": {
@@ -18,8 +26,6 @@
       "onAutoForward": "silent"
     }
   },
-  "initializeCommand": [".devcontainer/initialize.sh"],
-  "postCreateCommand": ["yarn", "install"],
   "customizations": {
     "vscode": {
       "extensions": [
@@ -32,9 +38,12 @@
         "davidanson.vscode-markdownlint",
         "redhat.vscode-yaml",
         "lokalise.i18n-ally",
+        "vitest.explorer",
+        "inlang.vs-code-extension",
         "ms-azuretools.vscode-docker"
       ],
       "settings": {
+        "task.allowAutomaticTasks": "on",
         "files.eol": "\n",
         "editor.tabSize": 2,
         "editor.formatOnPaste": false,
diff --git a/.devcontainer/frigate-hass-integration b/.devcontainer/frigate-hass-integration
index f54791ce..74ed5e69 160000
--- a/.devcontainer/frigate-hass-integration
+++ b/.devcontainer/frigate-hass-integration
@@ -1 +1 @@
-Subproject commit f54791cef3c214eb8df4fd433beddc2b9e0a66a9
+Subproject commit 74ed5e6948001347d35c292cd9c6862d2ebc6c39
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 53d59ad8..e8cbbcd0 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -20,7 +20,10 @@
           "endsPattern": "^created"
         }
       },
-      "isBackground": true
+      "isBackground": true,
+      "runOptions": {
+        "runOn": "folderOpen"
+      }
     }
   ]
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 46142256..a8ce8b8e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,12 +1,11 @@
 services:
-  dev:
-    build:
-      context: .
-      dockerfile: .devcontainer/Dockerfile
+  devcontainer:
+    build: .devcontainer
+    init: true
     env_file:
       - .env
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker-host.sock
       - .:${LOCAL_WORKSPACE_FOLDER}:cached
   hass:
     extends: