feat: Refactor to use scripts

.github/workflows/build-boxkit.yml

@@ -11,7 +11,6 @@ on:
     paths-ignore:
       - '**/README.md'
 env:
-    IMAGE_NAME: boxkit
     IMAGE_TAGS: latest
     IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
 
@@ -25,7 +24,10 @@ jobs:
       id-token: write
     strategy:
       fail-fast: false
-    steps: 
+      matrix:
+        containerfile: 
+          - boxkit
+          #- fedora-example # Included as an example to demonstrate multi-image builds, uncomment to build the fedora-example container too
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
         uses: actions/checkout@v4
@@ -36,7 +38,7 @@ jobs:
         id: meta
         with:
           images: |
-            ${{ env.IMAGE_NAME }}
+            ${{ matrix.containerfile }}
           labels: |
             io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/boxkit/main/README.md
 
@@ -46,8 +48,8 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: |
-            ./Containerfile
-          image: ${{ env.IMAGE_NAME }}
+            ./ContainerFiles/${{ matrix.containerfile }}
+          image: ${{ matrix.containerfile }}
           tags: ${{ env.IMAGE_TAGS }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
@@ -89,7 +91,7 @@ jobs:
       - name: Sign container image
         if: github.event_name != 'pull_request'
         run: |
-          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS}
+          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ matrix.containerfile }}@${TAGS}
         env:
           TAGS: ${{ steps.push.outputs.digest }}
           COSIGN_EXPERIMENTAL: false

ContainerFiles/boxkit

@@ -0,0 +1,15 @@
+FROM quay.io/toolbx-images/alpine-toolbox:edge
+
+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="[email protected]"
+
+# Copy the setup scripts and package list
+COPY ../scripts/boxkit.sh /
+COPY ../scripts/distrobox-shims.sh /
+COPY ../packages/boxkit.packages /
+
+# Run the setup scripts
+RUN chmod +x boxkit.sh distrobox-shims.sh && /boxkit.sh
+RUN rm /boxkit.sh /distrobox-shims.sh /boxkit.packages

ContainerFiles/fedora-example

@@ -0,0 +1,15 @@
+FROM quay.io/fedora/fedora-toolbox:latest
+
+LABEL com.github.containers.toolbox="true" \
+      usage="This image is meant to be used with the toolbox or distrobox command" \
+      summary="An example ContainerFile to demonstrate multiple image builds." \
+      maintainer="[email protected]"
+
+# Copy the setup scripts and package list
+COPY ../scripts/fedora-sample.sh /
+COPY ../scripts/distrobox-shims.sh /
+COPY ../packages/fedora-example.packages /
+
+# Run the setup scripts
+RUN chmod +x fedora-example.sh distrobox-shims.sh && /fedora-example.sh
+RUN rm /fedora-example.sh /distrobox-shims.sh /fedora-example.packages

packages/fedora-example.packages

@@ -0,0 +1 @@
+helix

scripts/boxkit.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Symlink distrobox shims
+./distrobox-shims.sh
+
+# Update the container and install packages
+apk update && apk upgrade
+grep -v '^#' ./boxkit.packages | xargs apk add

scripts/distrobox-shims.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+ln -fs /bin/sh /usr/bin/sh
+ln -fs /usr/bin/distrobox-host-exec /usr/local/bin/docker
+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

scripts/fedora-example.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Symlink distrobox shims
+./distrobox-shims.sh
+
+# Update the container and install packages
+dnf update -y
+grep -v '^#' ./fedora-example.packages | xargs dnf install -y