diff --git a/.github/workflows/build-boxkit.yml b/.github/workflows/build-boxkit.yml index bd3e2cc..f22c6f7 100644 --- a/.github/workflows/build-boxkit.yml +++ b/.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/cosign-installer@v3.7.0 + - name: Install cosign + uses: sigstore/cosign-installer@v3.7.0 - name: Sign container image if: github.event_name != 'pull_request' diff --git a/ContainerFiles/boxkit b/ContainerFiles/boxkit index 31bb835..ead1ed5 100644 --- a/ContainerFiles/boxkit +++ b/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 \ No newline at end of file +RUN rm /boxkit.sh /distrobox-shims.sh /boxkit.packages diff --git a/ContainerFiles/fedora-example b/ContainerFiles/fedora-example index 4105227..5e5304a 100644 --- a/ContainerFiles/fedora-example +++ b/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 \ No newline at end of file +RUN rm /fedora-example.sh /distrobox-shims.sh /fedora-example.packages diff --git a/packages/boxkit-packages b/packages/boxkit-packages new file mode 100644 index 0000000..88dbf66 --- /dev/null +++ b/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 diff --git a/packages/fedora-example-packages b/packages/fedora-example-packages new file mode 100644 index 0000000..00af54c --- /dev/null +++ b/packages/fedora-example-packages @@ -0,0 +1 @@ +helix \ No newline at end of file