diff --git a/.github/workflows/build-toolbox.yml b/.github/workflows/build-ubuntu-toolbox.yml similarity index 96% rename from .github/workflows/build-toolbox.yml rename to .github/workflows/build-ubuntu-toolbox.yml index 37fd5a1a093..12d36f72535 100644 --- a/.github/workflows/build-toolbox.yml +++ b/.github/workflows/build-ubuntu-toolbox.yml @@ -1,11 +1,8 @@ -name: Build and Push Toolbox Image +name: Build and Push Ubuntu Toolbox Image on: schedule: - cron: '20 22 * * *' # 10:20pm everyday pull_request: - paths-ignore: - - '**.md' - - '**.txt' merge_group: workflow_dispatch: env: @@ -44,7 +41,7 @@ jobs: uses: redhat-actions/buildah-build@v2 with: containerfiles: | - ./Containerfile.toolbox + ./toolboxes/Containerfile.ubuntu image: ${{ env.IMAGE_NAME }} tags: ${{ env.IMAGE_TAGS }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/build-wolfi-toolbox.yml b/.github/workflows/build-wolfi-toolbox.yml new file mode 100644 index 00000000000..219cfba80cf --- /dev/null +++ b/.github/workflows/build-wolfi-toolbox.yml @@ -0,0 +1,100 @@ +name: Build and Push Wolfi Toolbox Image +on: + schedule: + - cron: '20 22 * * *' # 10:20pm everyday + pull_request: + merge_group: + workflow_dispatch: +env: + IMAGE_NAME: wolfi-toolbox + IMAGE_TAGS: latest + IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} + +jobs: + push-ghcr: + name: Build and push image + runs-on: ubuntu-22.04 + permissions: + contents: read + packages: write + id-token: write + strategy: + fail-fast: false + steps: + # Checkout push-to-registry action GitHub repository + - name: Checkout Push to Registry action + uses: actions/checkout@v3 + + # Build metadata + - name: Image Metadata + uses: docker/metadata-action@v4 + id: meta + with: + images: | + ${{ env.IMAGE_NAME }} + labels: | + io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ublue-os/boxkit/main/README.md + + # Build image using Buildah action + - name: Build Image + id: build_image + uses: redhat-actions/buildah-build@v2 + with: + containerfiles: | + ./toolboxes/Containerfile.wolfi + image: ${{ env.IMAGE_NAME }} + tags: ${{ env.IMAGE_TAGS }} + labels: ${{ steps.meta.outputs.labels }} + oci: false + + # 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 + - name: Lowercase Registry + id: registry_case + uses: ASzc/change-string-case-action@v5 + with: + string: ${{ env.IMAGE_REGISTRY }} + + # Push the image to GHCR (Image Registry) + - name: Push To GHCR + uses: redhat-actions/push-to-registry@v2 + if: github.event_name != 'pull_request' + id: push + env: + REGISTRY_USER: ${{ github.actor }} + REGISTRY_PASSWORD: ${{ github.token }} + with: + image: ${{ steps.build_image.outputs.image }} + tags: ${{ steps.build_image.outputs.tags }} + 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@v2 + if: github.event_name != 'pull_request' + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + # Sign container + - uses: sigstore/cosign-installer@v3.1.0 + if: github.event_name != 'pull_request' + + - 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} + env: + TAGS: ${{ steps.push.outputs.digest }} + COSIGN_EXPERIMENTAL: false + COSIGN_PRIVATE_KEY: ${{ secrets.SIGNING_SECRET }} + + - name: Echo outputs + run: | + echo "${{ toJSON(steps.push.outputs) }}" diff --git a/Containerfile.toolbox b/toolboxes/Containerfile.ubuntu similarity index 86% rename from Containerfile.toolbox rename to toolboxes/Containerfile.ubuntu index c1cf1f387eb..bf7e56a6126 100644 --- a/Containerfile.toolbox +++ b/toolboxes/Containerfile.ubuntu @@ -3,10 +3,10 @@ FROM quay.io/toolbx-images/ubuntu-toolbox:22.04 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" \ + summary="A cloud-native terminal experience powered by Ubuntu" \ maintainer="jorge.castro@gmail.com" -COPY toolbox-packages /toolbox-packages +COPY ./toolboxes/packages.ubuntu /toolbox-packages RUN apt-get update && \ apt-get upgrade -y && \ diff --git a/toolboxes/Containerfile.wolfi b/toolboxes/Containerfile.wolfi new file mode 100644 index 00000000000..c70f66da285 --- /dev/null +++ b/toolboxes/Containerfile.wolfi @@ -0,0 +1,16 @@ +FROM cgr.dev/chainguard/wolfi-base +# Thanks to Nuno do Carmo for the initial prototype + +LABEL com.github.containers.toolbox="true" \ + usage="This image is meant to be used with the toolbox or distrobox command" \ + summary="A new cloud-native terminal experience powered by Wolfi" \ + maintainer="jorge.castro@gmail.com" + +COPY ./toolboxes/packages.wolfi /toolbox-packages + +RUN apk update && \ + apk upgrade && \ + grep -v '^#' /toolbox-packages | xargs apk add + +RUN rm /toolbox-packages + diff --git a/toolbox-packages b/toolboxes/packages.ubuntu similarity index 100% rename from toolbox-packages rename to toolboxes/packages.ubuntu diff --git a/toolboxes/packages.wolfi b/toolboxes/packages.wolfi new file mode 100644 index 00000000000..12cf6b9d971 --- /dev/null +++ b/toolboxes/packages.wolfi @@ -0,0 +1,4 @@ +bash +curl +git +posix-libc-utils \ No newline at end of file