From 79303167a5d3db7fb8286fe5e8acdf1ddf56934e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Fri, 2 Feb 2024 02:57:03 +0100
Subject: [PATCH 1/3] Use fedora:latest as base

---
 Dockerfile.vscode | 18 +++++++++++++++---
 base-packages.txt | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)
 create mode 100644 base-packages.txt

diff --git a/Dockerfile.vscode b/Dockerfile.vscode
index 25f2c45..eebb7dd 100644
--- a/Dockerfile.vscode
+++ b/Dockerfile.vscode
@@ -1,5 +1,18 @@
-FROM registry.fedoraproject.org/fedora-toolbox:39
+FROM fedora:latest as base
+LABEL com.github.containers.toolbox="true"
 
+# Install base packages
+COPY base-packages.txt /
+RUN dnf -y upgrade \
+  && dnf install -y $(<base-packages.txt) \
+  && dnf clean -y all
+RUN rm /base-packages.txt
+
+# Squash image to reduce final size
+FROM scratch as squashed
+COPY --from=base / /
+
+FROM squashed
 # Install vscode repo
 RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
 RUN echo -e "\
@@ -12,8 +25,7 @@ gpgkey=https://packages.microsoft.com/keys/microsoft.asc\n\
 " > /etc/yum.repos.d/vscode.repo
 
 # Install packages
-RUN dnf update -y \
-  && dnf install -y \
+RUN dnf install -y \
   code \
   golang \
   neovim \
diff --git a/base-packages.txt b/base-packages.txt
new file mode 100644
index 0000000..7c0d8df
--- /dev/null
+++ b/base-packages.txt
@@ -0,0 +1,46 @@
+bc
+bzip2
+cracklib-dicts
+diffutils
+dnf-plugins-core
+findutils
+flatpak-spawn
+fpaste
+git
+gnupg2
+gnupg2-smime
+gvfs-client
+hostname
+iproute
+iputils
+keyutils
+krb5-libs
+less
+lsof
+mesa-dri-drivers
+mesa-vulkan-drivers
+mtr
+nss-mdns
+openssh-clients
+passwd
+pigz
+procps-ng
+psmisc
+rsync
+shadow-utils
+sudo
+tcpdump
+time
+traceroute
+tree
+unzip
+util-linux
+vte-profile
+vulkan-loader
+wget
+which
+whois
+words
+xorg-x11-xauth
+xz
+zip
\ No newline at end of file

From d7791bb4d1137cf148f4d0d798734f8d7e0f700d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Fri, 2 Feb 2024 02:57:54 +0100
Subject: [PATCH 2/3] Add go-task

---
 Dockerfile.vscode | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.vscode b/Dockerfile.vscode
index eebb7dd..a082bd1 100644
--- a/Dockerfile.vscode
+++ b/Dockerfile.vscode
@@ -48,6 +48,7 @@ ENV GOBIN=/usr/local/bin
 RUN go install github.com/cweill/gotests/gotests@latest \
   && go install github.com/fatih/gomodifytags@latest \
   && go install github.com/go-delve/delve/cmd/dlv@latest \
+  && go install github.com/go-task/task/v3/cmd/task@latest \
   && go install github.com/haya14busa/goplay/cmd/goplay@latest \
   && go install github.com/josharian/impl@latest \
   && go install golang.org/x/tools/gopls@latest \

From 17cdc3b2d4c134de45fb4c40e6ba492f70038d15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torjus=20H=C3=A5kestad?= <torjus@usit.uio.no>
Date: Fri, 2 Feb 2024 02:58:30 +0100
Subject: [PATCH 3/3] Get pre-commit from pip instead of dnf

---
 Dockerfile.vscode | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.vscode b/Dockerfile.vscode
index a082bd1..027a358 100644
--- a/Dockerfile.vscode
+++ b/Dockerfile.vscode
@@ -31,7 +31,6 @@ RUN dnf install -y \
   neovim \
   pinentry \
   pipx \
-  pre-commit \
   python3 \
   zsh \
   && dnf clean -y all
@@ -40,6 +39,7 @@ RUN dnf install -y \
 RUN PIPX_HOME=/usr/local/lib/pipx PIPX_BIN_DIR=/usr/local/bin pipx install \
   ipython \
   pip-audit \
+  pre-commit \
   poetry \
   && rm -rf /root/.cache