From a36ec3c19ba37636efa5d7f06b7f04227459c796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus.hakestad@usit.uio.no>
Date: Thu, 1 Feb 2024 16:03:31 +0100
Subject: [PATCH] Improve vscode container

---
 Dockerfile.vscode | 37 ++++++++++++++++++++++++++++++++-----
 README.md         | 12 ++++++++++--
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.vscode b/Dockerfile.vscode
index 6742c5a..14f8f63 100644
--- a/Dockerfile.vscode
+++ b/Dockerfile.vscode
@@ -1,8 +1,35 @@
 FROM registry.fedoraproject.org/fedora-toolbox:39
 
-RUN dnf install -y \
-  zsh \
-  neovim \
-  python3 \
-  golang
+# Install vscode repo
+RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
+RUN sh -c 'echo -e "[code]\nname=Visual Studio Code\nbaseurl=https://packages.microsoft.com/yumrepos/vscode\nenabled=1\ngpgcheck=1\ngpgkey=https://packages.microsoft.com/keys/microsoft.asc"> /etc/yum.repos.d/vscode.repo'
 
+RUN dnf update -y \
+  && dnf install -y \
+  code \
+  golang \
+  neovim \
+  pinentry \
+  pipx \
+  python3 \
+  zsh \
+  && dnf clean -y all
+
+# Install some python tools
+RUN PIPX_HOME=/usr/local/lib/pipx PIPX_BIN_DIR=/usr/local/bin pipx install \
+  poetry \
+  ipython
+
+# Install some go tools
+ENV GOBIN=/usr/local/bin
+RUN go install github.com/haya14busa/goplay/cmd/goplay@latest \
+  && go install github.com/go-delve/delve/cmd/dlv@latest \
+  && go install golang.org/x/tools/gopls@latest \
+  && go install honnef.co/go/tools/cmd/staticcheck@latest \
+  && go install github.com/fatih/gomodifytags@latest \
+  && go install github.com/josharian/impl@latest \
+  && go install github.com/cweill/gotests/gotests@latest \
+  && rm -rf /root/go
+
+ENV GOBIN=
+    
diff --git a/README.md b/README.md
index 8ee1fdd..25d7b78 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,15 @@
 # toolboxes
 
-Different containers for use with `toolbox`
+Different containers for use with `toolbox` / `distrobox`
 
 ## Images
 
-TODO
+### vscode
+
+Contains vscode, python and golang, as well as some commonly used
+tools.
+
+To install:
+
+`podman pull git.t-juice.club/torjus/toolboxes/vscode:latest`
+