From 31c7e6362be7b996298dd2c8c66812590babc512 Mon Sep 17 00:00:00 2001
From: Quentin McGaw <quentin.mcgaw@gmail.com>
Date: Sat, 16 Apr 2022 21:00:37 +0000
Subject: [PATCH] chore(devcontainer): multiple changes and fixes - Fix windows
 script sourcing - Remove image name to avoid conflicts - Bind mount normally
 without `:z` - Install `htop`

---
 .devcontainer/Dockerfile         | 2 +-
 .devcontainer/devcontainer.json  | 3 ++-
 .devcontainer/docker-compose.yml | 9 ++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8eae9d54..092e2478 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,2 +1,2 @@
 FROM qmcgaw/godevcontainer
-RUN apk add wireguard-tools
+RUN apk add wireguard-tools htop
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 96802c16..1a2666dd 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,7 @@
         "vscode"
     ],
     "shutdownAction": "stopCompose",
-    "postCreateCommand": "~/.windows.sh && go mod download && go mod tidy",
+    "postCreateCommand": "source ~/.windows.sh && go mod download && go mod tidy",
     "workspaceFolder": "/workspace",
     "extensions": [
         "golang.go",
@@ -25,6 +25,7 @@
         "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked
         "IBM.output-colorizer", // Colorize your output/test logs
         "mohsen1.prettify-json", // Prettify JSON data
+        "github.copilot",
     ],
     "settings": {
         "files.eol": "\n",
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index d9856287..e199249b 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -3,7 +3,6 @@ version: "3.7"
 services:
   vscode:
     build: .
-    image: godevcontainer
     devices:
       - /dev/net/tun:/dev/net/tun
     volumes:
@@ -11,16 +10,16 @@ services:
       # Docker socket to access Docker server
       - /var/run/docker.sock:/var/run/docker.sock
       # Docker configuration
-      - ~/.docker:/root/.docker:z
+      - ~/.docker:/root/.docker
       # SSH directory for Linux, OSX and WSL
-      - ~/.ssh:/root/.ssh:z
+      - ~/.ssh:/root/.ssh
       # For Windows without WSL, a copy will be made
       # from /tmp/.ssh to ~/.ssh to fix permissions
       #- ~/.ssh:/tmp/.ssh:ro
       # Shell history persistence
-      - ~/.zsh_history:/root/.zsh_history:z
+      - ~/.zsh_history:/root/.zsh_history
       # Git config
-      - ~/.gitconfig:/root/.gitconfig:z
+      - ~/.gitconfig:/root/.gitconfig
     environment:
       - TZ=
     cap_add: