Add file and openssl

Reviewed-on: #1

.gitea/workflows/publish-images.yml

@@ -3,6 +3,9 @@ name: publish-images
 on:
   push:
     branches: [ master ]
+    paths:
+      - "Dockerfile*"
+      - "base-packages.txt"
   schedule:
     - cron: "0 4 * * 7"
 

Dockerfile.vscode

@@ -1,11 +1,32 @@
-FROM registry.fedoraproject.org/fedora-toolbox:39
+FROM fedora:latest as base
+
+# 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
+LABEL com.github.containers.toolbox="true"
 
 # 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 echo -e "\
+[code]\n\
+name=Visual Studio Code\n\
+baseurl=https://packages.microsoft.com/yumrepos/vscode\n\
+enabled=1\n\
+gpgcheck=1\n\
+gpgkey=https://packages.microsoft.com/keys/microsoft.asc\n\
+" > /etc/yum.repos.d/vscode.repo
 
-RUN dnf update -y \
-  && dnf install -y \
+# Install packages
+RUN dnf install -y \
   code \
   golang \
   neovim \
@@ -17,21 +38,24 @@ RUN dnf update -y \
 
 # Install some python tools
 RUN PIPX_HOME=/usr/local/lib/pipx PIPX_BIN_DIR=/usr/local/bin pipx install \
-  poetry \
+  ipython \
   pip-audit \
-  ipython
+  pre-commit \
+  poetry \
+  && rm -rf /root/.cache
 
 # 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 \
+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 github.com/cweill/gotests/gotests@latest \
+  && go install golang.org/x/tools/gopls@latest \
   && go install golang.org/x/vuln/cmd/govulncheck@latest \
-  && rm -rf /root/go
+  && go install honnef.co/go/tools/cmd/staticcheck@latest \
+  && go clean -cache \
+  && rm -rf /root/go /root/.cache
 
 ENV GOBIN=
-    

base-packages.txt

@@ -0,0 +1,52 @@
+bc
+bzip2
+cracklib-dicts
+diffutils
+dnf-plugins-core
+file
+findutils
+flatpak-spawn
+fpaste
+git
+glibc-all-langpacks
+glibc-locale-source
+gnupg2
+gnupg2-smime
+gvfs-client
+hostname
+iproute
+iputils
+keyutils
+krb5-libs
+less
+lsof
+man-db
+mesa-dri-drivers
+mesa-vulkan-drivers
+mlocate
+mtr
+nss-mdns
+openssh-clients
+openssl
+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

scripts/tbx-helper.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+usage() {
+    echo "Usage: $0 COMMAND"
+    echo ""
+    echo "Available commands:"
+    echo "pull-images           Pull all known toolbox images"
+}
+
+pull_images() {
+    podman pull git.t-juice.club/torjus/toolboxes/vscode:latest
+}
+
+if [ $# != 1 ]; then
+    usage
+    exit 1
+fi
+
+case "$1" in
+    pull-images)
+        pull_images
+	;;
+    *)
+        usage
+        ;;
+esac