add cosign pubkey, rebase image on wolfi

.github/workflows/build-boxkit.yml → .github/workflows/build-devbox.yml

@@ -1,4 +1,4 @@
-name: build-boxkit
+name: build-devboxes
 on:
   workflow_dispatch: # allow manually triggering builds
   pull_request:
@@ -28,8 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         containerfile: 
-          - boxkit
-       #- fedora-example # Included as an example to demonstrate multi-image builds, uncomment to build the fedora-example container too
+          - devbox
     steps:
       # Clone code to runner
       - name: Checkout

ContainerFiles/boxkit → ContainerFiles/devbox

@@ -1,15 +1,15 @@
-FROM quay.io/toolbx-images/alpine-toolbox:edge
+FROM cgr.dev/chainguard/wolfi-base:latest
 
 LABEL com.github.containers.toolbox="true" \
       usage="This image is meant to be used with the toolbox or distrobox command" \
       summary="A cloud-native terminal experience" \
-      maintainer="jorge.castro@gmail.com"
+      maintainer="mario@techmunchies.net"
 
 # Copy the setup scripts and package list
-COPY ../scripts/boxkit.sh /
+COPY ../scripts/devbox.sh /
 COPY ../scripts/distrobox-shims.sh /
-COPY ../packages/boxkit.packages /
+COPY ../packages/devbox.packages /
 
 # Run the setup scripts
-RUN chmod +x boxkit.sh distrobox-shims.sh && /boxkit.sh
-RUN rm /boxkit.sh /distrobox-shims.sh /boxkit.packages
+RUN /devbox.sh
+RUN rm /devbox.sh /distrobox-shims.sh /devbox.packages

cosign.pub

@@ -1,4 +1,4 @@
 -----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEHLRpBfPRYiMl9wb7s6fx47PzzNWu
-3zyJgXhWEvxoOgwv9CpwjbvUwR9qHxNMWkJhuGE6cjDA2hpy1I6NbA+24Q==
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEwAggsjy/jfdyNQTC85QdUo8hGASB
+KggXxA0FbRLr3YVSwClnSIaEFe9Ac32upOIRIPwoPt1DXcGkAiSfyF0HBw==
 -----END PUBLIC KEY-----

packages/devbox.packages

@@ -0,0 +1,16 @@
+age
+atuin
+bat
+chezmoi
+cosign
+curl
+direnv
+fzf
+git
+just
+make
+ncurses
+neovim
+ripgrep
+wl-clipboard
+zstd

scripts/devbox.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Update the container and install packages
+apk update && apk upgrade
+grep -v '^#' ./devbox.packages | xargs apk add
+
+# Get Distrobox-host-exec and host-spawn
+# TODO: fix shellcheck warnings
+git clone https://github.com/89luca89/distrobox.git --single-branch /tmp/distrobox &&
+	cp /tmp/distrobox/distrobox-host-exec /usr/bin/distrobox-host-exec &&
+	cp /tmp/distrobox/distrobox-export /usr/bin/distrobox-export &&
+	cp /tmp/distrobox/distrobox-init /usr/bin/entrypoint &&
+	curl https://github.com/1player/host-spawn/releases/download/$(cat /tmp/distrobox/distrobox-host-exec | grep host_spawn_version= | cut -d "\"" -f 2)/host-spawn-$(uname -m) -o /usr/bin/host-spawn &&
+	chmod +x /usr/bin/host-spawn &&
+	rm -rf /tmp/distrobox &&
+	ln -fs /bin/sh /usr/bin/sh
+
+# Symlink distrobox shims
+./distrobox-shims.sh

scripts/distrobox-shims.sh

@@ -1,8 +1,5 @@
 #!/bin/sh
 
-ln -fs /bin/sh /usr/bin/sh
-ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker
+mkdir -p /usr/local/bin
 ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/flatpak
 ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/podman
-ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/rpm-ostree
-ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/transactional-update