Merge pull request #756 from felipecrs/refresh-devcontainer

Refresh the devcontainer

.devcontainer/devcontainer.json

@@ -5,11 +5,20 @@
   "workspaceFolder": "${localWorkspaceFolder}",
   "shutdownAction": "stopCompose",
   "portsAttributes": {
-    "41000": {
+    "1000": {
       "label": "Rollup",
       "onAutoForward": "silent"
+    },
+    "hass:8123": {
+      "label": "Home Assistant",
+      "onAutoForward": "silent"
+    },
+    "frigate:5000": {
+      "label": "Frigate",
+      "onAutoForward": "silent"
     }
   },
+  "forwardPorts": [1000, "hass:8123", "frigate:5000"],
   "initializeCommand": ".devcontainer/initialize.sh",
   "postCreateCommand": "yarn install",
   "extensions": [

.devcontainer/initialize.sh

@@ -1,18 +1,7 @@
 #!/bin/bash
 
-set -euo pipefail
+set -euxo pipefail
-
-readonly wanted_line_key="LOCAL_WORKSPACE_FOLDER"
-readonly wanted_line="${wanted_line_key}='${PWD}'"
-readonly file=".env"
-
-echo "Writing ${wanted_line} to ${file}" >&2
-if [[ -f "${file}" ]] && grep --quiet "^${wanted_line_key}=" "${file}"; then
-    sed --in-place "s,^${wanted_line_key}=.*,${wanted_line}," "${file}"
-else
-    echo "${wanted_line}" >>"${file}"
-fi
-
-set -x
 
 git submodule update --init
+
+.devcontainer/frigate-hass-integration/.devcontainer/set_dot_env.sh

.devcontainer/preconfig/.storage/lovelace_resources

@@ -5,7 +5,7 @@
   "data": {
     "items": [
       {
-        "url": "http://localhost:41000/frigate-hass-card.js",
+        "url": "http://localhost:1000/frigate-hass-card.js",
         "type": "module",
         "id": "00c459541bac4290af01c51bf9c06ba1"
       }

.vscode/launch.json

@@ -5,10 +5,10 @@
       "type": "pwa-chrome",
       "request": "launch",
       "name": "Launch Chrome against Home Assistant",
-      "url": "http://localhost:48123",
+      "url": "http://localhost:8123",
       "webRoot": "${workspaceFolder}/dist",
       "preLaunchTask": "Rollup",
-      "resolveSourceMapLocations": ["http://localhost:41000/**"]
+      "resolveSourceMapLocations": ["http://localhost:1000/**"]
     }
   ]
 }

docker-compose.yml

@@ -5,9 +5,6 @@ services:
     user: node
     init: true
     build: .devcontainer
-    ports:
-      # Rollup
-      - 41000:41000
     env_file:
       - .env
     volumes:

rollup.config.js

@@ -19,7 +19,7 @@ const dev = watch || process.env.DEV === 'true' || process.env.DEV === '1';
 const serveopts = {
   contentBase: ['./dist'],
   host: '0.0.0.0',
-  port: 41000,
+  port: 1000,
   allowCrossOrigin: true,
   headers: {
     'Access-Control-Allow-Origin': '*',