From fd707dd857b871293f5ded98138938fae84fd1a6 Mon Sep 17 00:00:00 2001
From: Sujal Goswami <sujalgoswamiofficial@gmail.com>
Date: Wed, 28 Aug 2024 00:17:58 +0530
Subject: [PATCH] Add devconatainer config file for easy development using VS
 Code.

---
 .devcontainer/devcontainer.json | 19 +++++++++++++++++++
 .dockerignore                   |  3 ---
 Dockerfile                      |  2 --
 docker-compose.yml              |  7 +++++--
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000..ffc27607
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,19 @@
+{
+    "name": "Wave Terminal Dev Container",
+    "dockerComposeFile": "../docker-compose.yml",
+    "service": "wave",
+    "workspaceFolder": "/app/waveterm",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash",
+                "extensions": [
+                    "golang.go",
+                    "dbaeumer.vscode-eslint",
+                    "esbenp.prettier-vscode"
+                ]
+            }
+        }
+    },
+    "remoteUser": "wave"
+}
diff --git a/.dockerignore b/.dockerignore
index 94078373..9f825934 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -11,9 +11,6 @@ logs
 *.log
 *.tmp
 
-
-
-
 # Ignore test and coverage files
 coverage
 test-results
diff --git a/Dockerfile b/Dockerfile
index 251fed66..c3200ce9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,5 +31,3 @@ RUN scripthaus run webpack-watch
 RUN useradd -m -s /bin/bash wave
 USER wave
 
-CMD [ "scripthaus", "run", "electron" ]
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 9f3711f1..1c3b2bb4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,8 +8,11 @@ services:
     container_name: waveterminal
     environment:
       - DISPLAY=${DISPLAY}
+      - NODE_ENV=development
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix
-    command: scripthaus run electron
+      - .:/app/waveterm
     stdin_open: true
-    tty: true
\ No newline at end of file
+    tty: true
+    ports:
+      - "3000:3000"