diff --git a/.github/workflows/archlinux.yaml b/.github/workflows/archlinux.yaml deleted file mode 100644 index 6d7ed611..00000000 --- a/.github/workflows/archlinux.yaml +++ /dev/null @@ -1,127 +0,0 @@ -name: "Arch Linux: Build and push toolbx image" - -permissions: read-all - -on: - pull_request: - branches: - - main - paths: - - archlinux/** - - .github/workflows/archlinux.yaml - push: - branches: - - main - paths: - - archlinux/** - - .github/workflows/archlinux.yaml - schedule: - - cron: '0 0 * * MON' - -env: - distro: 'archlinux' - distro_pretty: 'Arch Linux' - latest_release: 'latest' - platforms: 'linux/amd64' - registry: 'quay.io/toolbx-images' - -# Prevent multiple workflow runs from racing to ensure that pushes are made -# sequentialy for the main branch. Also cancel in progress workflow runs for -# pull requests only. -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: ${{ github.event_name == 'pull_request' }} - -jobs: - build-push-images: - strategy: - matrix: - release: ['latest'] - - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - # - name: Set up QEMU for multi-arch builds - # shell: bash - # run: | - # sudo apt update - # sudo apt install qemu-user-static - - # - name: Build container image - # uses: redhat-actions/buildah-build@v2 - # if: env.latest_release != matrix.release - # with: - # platforms: ${{ env.platforms }} - # context: ${{ env.distro }}/${{ matrix.release }} - # image: ${{ env.distro }}-toolbox - # tags: ${{ matrix.release }} - # containerfiles: ${{ env.distro }}/${{ matrix.release }}/Containerfile - # layers: false - # oci: true - - - name: Build container image (latest tag) - uses: redhat-actions/buildah-build@v2 - if: env.latest_release == matrix.release - with: - platforms: ${{ env.platforms }} - # context: ${{ env.distro }}/${{ matrix.release }} - context: ${{ env.distro }} - image: ${{ env.distro }}-toolbox - # tags: ${{ matrix.release }} latest - tags: latest - # containerfiles: ${{ env.distro }}/${{ matrix.release }}/Containerfile - containerfiles: ${{ env.distro }}/Containerfile - layers: false - oci: true - - # - name: Push to Container Registry - # uses: redhat-actions/push-to-registry@v2 - # id: push - # if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release != matrix.release - # with: - # username: ${{ secrets.BOT_USERNAME }} - # password: ${{ secrets.BOT_SECRET }} - # image: ${{ env.distro }}-toolbox - # registry: ${{ env.registry }} - # tags: ${{ matrix.release }} - - - name: Push to Container Registry (latest tag) - uses: redhat-actions/push-to-registry@v2 - id: push-latest - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release == matrix.release - with: - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_SECRET }} - image: ${{ env.distro }}-toolbox - registry: ${{ env.registry }} - # tags: ${{ matrix.release }} latest - tags: latest - - - name: Login to Container Registry - uses: redhat-actions/podman-login@v1 - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' - with: - registry: ${{ env.registry }} - username: ${{ secrets.BOT_USERNAME }} - password: ${{ secrets.BOT_SECRET }} - - - uses: sigstore/cosign-installer@v3.3.0 - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' - - # - name: Sign container image - # if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release != matrix.release - # run: | - # cosign sign -y --recursive --key env://COSIGN_PRIVATE_KEY ${{ env.registry }}/${{ env.distro }}-toolbox@${{ steps.push.outputs.digest }} - # env: - # COSIGN_EXPERIMENTAL: false - # COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} - - - name: Sign container image (latest) - if: (github.event_name == 'push' || github.event_name == 'schedule') && github.ref == 'refs/heads/main' && env.latest_release == matrix.release - run: | - cosign sign -y --recursive --key env://COSIGN_PRIVATE_KEY ${{ env.registry }}/${{ env.distro }}-toolbox@${{ steps.push-latest.outputs.digest }} - env: - COSIGN_EXPERIMENTAL: false - COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }} diff --git a/README.md b/README.md index 2ff48ad1..3c49267a 100644 --- a/README.md +++ b/README.md @@ -61,10 +61,17 @@ directly use the commands below: $ toolbox enter amazonlinux-toolbox-2 ``` -- [Arch Linux]: +- [Arch Linux]: The images are now maintained as part of [Toolbx] ([GitHub]) + ([repo on Quay.io](https://quay.io/repository/toolbx/arch-toolbox)). Usage: ``` - $ toolbox create --image quay.io/toolbx-images/archlinux-toolbox:latest - $ toolbox enter archlinux-toolbox-latest + $ toolbox create --distro arch + $ toolbox enter arch-toolbox-latest + ``` + + Or, alternatively: + ``` + $ toolbox create --image quay.io/toolbx/arch-toolbox:latest + $ toolbox enter arch-toolbox-latest ``` - [CentOS (Stream)] with [EPEL] enabled by default: diff --git a/archlinux/Containerfile b/archlinux/Containerfile deleted file mode 100644 index e14cb660..00000000 --- a/archlinux/Containerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM docker.io/library/archlinux:base-devel - -LABEL com.github.containers.toolbox="true" \ - name="archlinux-toolbox" \ - version="base-devel" \ - usage="This image is meant to be used with the toolbox command" \ - summary="Base image for creating Arch Linux toolbox containers" \ - maintainer="Morten Linderud " - -# Install extra packages -COPY extra-packages / -RUN pacman -Syu --needed --noconfirm - < extra-packages -RUN rm /extra-packages - -# Clean up cache -RUN pacman -Scc --noconfirm - -# Enable sudo permission for wheel users -RUN echo "%wheel ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/toolbox diff --git a/archlinux/extra-packages b/archlinux/extra-packages deleted file mode 100644 index 545eec41..00000000 --- a/archlinux/extra-packages +++ /dev/null @@ -1,26 +0,0 @@ -bash-completion -diffutils -flatpak-xdg-utils -git -gnupg -keyutils -lsof -man-db -man-pages -mlocate -mtr -nss-mdns -openssh -pigz -procps-ng -rsync -tcpdump -time -traceroute -tree -unzip -vte-common -wget -words -xorg-xauth -zip