chore(devcontainer): multiple changes and fixes

- Fix windows script sourcing
- Remove image name to avoid conflicts
- Bind mount normally without `:z`
- Install `htop`
This commit is contained in:
Quentin McGaw
2022-04-16 21:00:37 +00:00
parent 072b42d867
commit 31c7e6362b
3 changed files with 7 additions and 7 deletions

View File

@@ -1,2 +1,2 @@
FROM qmcgaw/godevcontainer FROM qmcgaw/godevcontainer
RUN apk add wireguard-tools RUN apk add wireguard-tools htop

View File

@@ -8,7 +8,7 @@
"vscode" "vscode"
], ],
"shutdownAction": "stopCompose", "shutdownAction": "stopCompose",
"postCreateCommand": "~/.windows.sh && go mod download && go mod tidy", "postCreateCommand": "source ~/.windows.sh && go mod download && go mod tidy",
"workspaceFolder": "/workspace", "workspaceFolder": "/workspace",
"extensions": [ "extensions": [
"golang.go", "golang.go",
@@ -25,6 +25,7 @@
"bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked "bajdzis.vscode-database", // Supports connections to mysql or postgres, over SSL, socked
"IBM.output-colorizer", // Colorize your output/test logs "IBM.output-colorizer", // Colorize your output/test logs
"mohsen1.prettify-json", // Prettify JSON data "mohsen1.prettify-json", // Prettify JSON data
"github.copilot",
], ],
"settings": { "settings": {
"files.eol": "\n", "files.eol": "\n",

View File

@@ -3,7 +3,6 @@ version: "3.7"
services: services:
vscode: vscode:
build: . build: .
image: godevcontainer
devices: devices:
- /dev/net/tun:/dev/net/tun - /dev/net/tun:/dev/net/tun
volumes: volumes:
@@ -11,16 +10,16 @@ services:
# Docker socket to access Docker server # Docker socket to access Docker server
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
# Docker configuration # Docker configuration
- ~/.docker:/root/.docker:z - ~/.docker:/root/.docker
# SSH directory for Linux, OSX and WSL # SSH directory for Linux, OSX and WSL
- ~/.ssh:/root/.ssh:z - ~/.ssh:/root/.ssh
# For Windows without WSL, a copy will be made # For Windows without WSL, a copy will be made
# from /tmp/.ssh to ~/.ssh to fix permissions # from /tmp/.ssh to ~/.ssh to fix permissions
#- ~/.ssh:/tmp/.ssh:ro #- ~/.ssh:/tmp/.ssh:ro
# Shell history persistence # Shell history persistence
- ~/.zsh_history:/root/.zsh_history:z - ~/.zsh_history:/root/.zsh_history
# Git config # Git config
- ~/.gitconfig:/root/.gitconfig:z - ~/.gitconfig:/root/.gitconfig
environment: environment:
- TZ= - TZ=
cap_add: cap_add: