Merge remote-tracking branch 'upstream/main'

wetheredge · Oct 12, 2023 · c3bb6f4 · c3bb6f4
2 parents 7aed1f7 + b4f6466
commit c3bb6f4
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 9 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -29,11 +29,11 @@ jobs:
     steps: 
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Build metadata
       - name: Image Metadata
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         id: meta
         with:
           images: |
@@ -83,20 +83,19 @@ jobs:
             --disable-content-trust
             
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       # Sign container
-      - uses: sigstore/cosign-installer@v3.1.1
+      - uses: sigstore/cosign-installer@v3.1.2
 
       - name: Sign container image
+        if: github.event_name != 'pull_request'
         run: |
-          echo "${{ env.COSIGN_PRIVATE_KEY }}" > cosign.key
-          wc -c cosign.key
-          cosign sign -y --key cosign.key ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS}
+          cosign sign -y --key env://COSIGN_PRIVATE_KEY ${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}@${TAGS}
         env:
           TAGS: ${{ steps.push.outputs.digest }}
           COSIGN_EXPERIMENTAL: false

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## [1.1.0](https://github.com/ublue-os/boxkit/compare/v1.0.0...v1.1.0) (2023-10-09)
+
+
+### Features
+
+* add age package ([#30](https://github.com/ublue-os/boxkit/issues/30)) ([b0989a9](https://github.com/ublue-os/boxkit/commit/b0989a9f791771999c105122b64cbf8687574650)), closes [#29](https://github.com/ublue-os/boxkit/issues/29)
+* add bat and exa ([#27](https://github.com/ublue-os/boxkit/issues/27)) ([011241e](https://github.com/ublue-os/boxkit/commit/011241e4ac1fdee5f3fbe8b8321e44ba8a0cb561))
+* add clipboard ([ebc22bf](https://github.com/ublue-os/boxkit/commit/ebc22bf72a10043ebec55c285dfe5274f1378cc5))
+* add dependabot for actions ([#18](https://github.com/ublue-os/boxkit/issues/18)) ([cc17ca5](https://github.com/ublue-os/boxkit/commit/cc17ca5202c1777d5e64799b00cb235b72027e24))
+* add make ([#10](https://github.com/ublue-os/boxkit/issues/10)) ([0cb4b59](https://github.com/ublue-os/boxkit/commit/0cb4b59cdd98c47d2f6bfa21f801b99b045d5e40))
+* add npm ([#8](https://github.com/ublue-os/boxkit/issues/8)) ([9f91bd0](https://github.com/ublue-os/boxkit/commit/9f91bd09272617c7b9203014222353265dc24947))
+* add vimdiff ([#12](https://github.com/ublue-os/boxkit/issues/12)) ([cf4202f](https://github.com/ublue-os/boxkit/commit/cf4202f76752561d9b926c81933342a119e8a258))
+* add wl-clipboard ([#16](https://github.com/ublue-os/boxkit/issues/16)) ([347647e](https://github.com/ublue-os/boxkit/commit/347647ea7f9f7bdb3b42d2a565df866f027a7ade))
+* nicer filter to allow commenting out apps ([#15](https://github.com/ublue-os/boxkit/issues/15)) ([61d3e33](https://github.com/ublue-os/boxkit/commit/61d3e330beb9c2a8bd557ef3872aa6595c76b1b2))
+* Replace exa with eza ([#57](https://github.com/ublue-os/boxkit/issues/57)) ([34653a2](https://github.com/ublue-os/boxkit/commit/34653a2dde5b4e1cf895a2d65fc9168e064fa224))
+* switch to alpine edge ([#22](https://github.com/ublue-os/boxkit/issues/22)) ([cf396c3](https://github.com/ublue-os/boxkit/commit/cf396c369ae8d8bb052df9b0c39d392f61b909ba))
+
+
+### Bug Fixes
+
+* container signing ([#55](https://github.com/ublue-os/boxkit/issues/55)) ([9b695c1](https://github.com/ublue-os/boxkit/commit/9b695c1a21a94e7b6a40f5175408b8fc650e9413))
+* fix typo ([8addf9e](https://github.com/ublue-os/boxkit/commit/8addf9e4499a83b2b9b591e9808470f3e3f6a46e))
+* update dependabot ([#19](https://github.com/ublue-os/boxkit/issues/19)) ([0c388c9](https://github.com/ublue-os/boxkit/commit/0c388c958985cdc7d3c2d3de5d6d58de09472edf))
+* update maintainer field ([#37](https://github.com/ublue-os/boxkit/issues/37)) ([e94a8a6](https://github.com/ublue-os/boxkit/commit/e94a8a69c34f5692514ebcc8c3ac21e2f33aa947))
+
 ## 1.0.0 (2023-02-04)
 
 

diff --git a/README.md b/README.md
@@ -1,5 +1,17 @@
 # boxkit
 
+## Description
+
+boxkit is a set of GitHub actions and skeleton files to build toolbox and distrobox images. Basically, clone this repo, make the changes you want, and then build what you need. Some examples include:
+
+- [DaVinci Box](https://github.com/zelikos/davincibox) - Container for DaVinci Resolve installation and runtime dependencies on Linux
+- [obs-studio-portable](https://github.com/ublue-os/obs-studio-portable) - OCI container image of OBS Studio that bundles a curated collection of 3rd party plugins
+- [bazzite-arch](https://github.com/ublue-os/bazzite-arch) - A ready-to-game Arch Linux based OCI designed for use exclusively in distrobox
+
+## Boxkit Alpine Example
+
+You can use whatever distribution you want with boxkit, this is the initial example ([here are more](https://github.com/ublue-os/bluefin/tree/main/toolboxes)):
+
 A base image and action for Toolbx and Distrobox.
 Sure, you can use the distro you're used to, but what if ... 
 
@@ -51,7 +63,7 @@ Use `chezmoi` to pull down your dotfiles and set up git sync.
 Fork and add programs to this this image - over time you'll end up with the perfect CLI for you.
 Keeping it as a pet works, though the author recommends leaving all your config in git and routinely pulling a new image.
 
-The user experience is much nicer if you [set your terminal open right in the container](https://distrobox.privatedns.org/useful_tips.html#using-distrobox-as-main-cli) and is the intended experience. 
+The user experience is much nicer if you [set your terminal open right in the container](https://distrobox.privatedns.org/useful_tips/#using-distrobox-as-main-cli) and is the intended experience. 
 
 ## Why?
 

diff --git a/extra-packages b/extra-packages
@@ -4,7 +4,7 @@ bat
 btop
 clang-tools-extra
 # cosign
-exa
+eza
 fd-find
 fish
 gcc
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ bat @@
     btop
     clang-tools-extra
     # cosign
-    exa
+    eza
     fd-find
     fish
     gcc
@@ Expand Down @@