Merge branch 'main' into use-scripts

.github/workflows/build-boxkit.yml

@@ -1,5 +1,6 @@
 name: build-boxkit
 on:
+  workflow_dispatch: # allow manually triggering builds
   pull_request:
     branches:
       - main
@@ -8,8 +9,8 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - '**/README.md'
+    paths-ignore: # don't rebuild on documentation change
+      - '**.md'
 env:
     IMAGE_TAGS: latest
     IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
@@ -27,11 +28,12 @@ jobs:
       matrix:
         containerfile: 
           - boxkit
-          #- fedora-example # Included as an example to demonstrate multi-image builds, uncomment to build the fedora-example container too
+       #- fedora-example # Included as an example to demonstrate multi-image builds, uncomment to build the fedora-example container too
+    steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
         uses: actions/checkout@v4
-        
+
       # Build metadata
       - name: Image Metadata
         uses: docker/metadata-action@v5
@@ -52,7 +54,7 @@ jobs:
           image: ${{ matrix.containerfile }}
           tags: ${{ env.IMAGE_TAGS }}
           labels: ${{ steps.meta.outputs.labels }}
-          oci: false
+          oci: true
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
       # https://github.com/macbre/push-to-ghcr/issues/12
@@ -75,8 +77,6 @@ jobs:
           registry: ${{ steps.registry_case.outputs.lowercase }}
           username: ${{ env.REGISTRY_USER }}
           password: ${{ env.REGISTRY_PASSWORD }}
-          extra-args: |
-            --disable-content-trust
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
@@ -86,7 +86,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/[email protected]
+      - name: Install cosign
+        uses: sigstore/[email protected]
 
       - name: Sign container image
         if: github.event_name != 'pull_request'

ContainerFiles/boxkit

@@ -12,4 +12,4 @@ 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
+RUN rm /boxkit.sh /distrobox-shims.sh /boxkit.packages

ContainerFiles/fedora-example

@@ -12,4 +12,4 @@ 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
+RUN rm /fedora-example.sh /distrobox-shims.sh /fedora-example.packages

packages/boxkit-packages

@@ -0,0 +1,30 @@
+age
+atuin
+btop
+bat
+chezmoi
+clipboard
+cosign
+dbus-x11
+direnv
+eza
+ffmpeg
+fzf
+github-cli
+helix
+just
+make
+micro
+ncdu
+ncurses
+neovim
+npm
+plocate
+python3
+ripgrep
+speedtest-cli
+starship
+vimdiff
+wl-clipboard
+zellij
+zstd

packages/fedora-example-packages

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