From 27e5a3b9601c4178016f98174c8c7491a3779e61 Mon Sep 17 00:00:00 2001 From: Ruben Date: Sun, 28 Apr 2024 01:11:47 -0500 Subject: [PATCH] chore: remove arch toolboxes --- .../workflows/build-arch-gnome-toolbox.yml | 124 ------------------ .github/workflows/build-arch-toolbox.yml | 124 ------------------ README.md | 2 +- toolboxes/arch-toolbox/Containerfile.arch | 73 ----------- .../arch-toolbox/Containerfile.arch-gnome | 76 ----------- .../files/usr/share/latencyflex/dxvk.conf | 2 - 6 files changed, 1 insertion(+), 400 deletions(-) delete mode 100644 .github/workflows/build-arch-gnome-toolbox.yml delete mode 100644 .github/workflows/build-arch-toolbox.yml delete mode 100644 toolboxes/arch-toolbox/Containerfile.arch delete mode 100644 toolboxes/arch-toolbox/Containerfile.arch-gnome delete mode 100644 toolboxes/arch-toolbox/files/usr/share/latencyflex/dxvk.conf diff --git a/.github/workflows/build-arch-gnome-toolbox.yml b/.github/workflows/build-arch-gnome-toolbox.yml deleted file mode 100644 index 406e493..0000000 --- a/.github/workflows/build-arch-gnome-toolbox.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: Build Arch (GNOME) Toolbox (Sernik) Image -on: - schedule: - - cron: '0 19 * * *' # 9:00pm everyday - pull_request: - branches: - - main - paths-ignore: - - '**.md' - - '**.txt' - pull_request_review: - type: [submitted] - push: - branches: - - main - paths-ignore: - - '**.md' - - '**.txt' - merge_group: - workflow_dispatch: -env: - IMAGE_NAME: arch-gnome-toolbox - IMAGE_TAGS: latest - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - -concurrency: - group: ${{ github.workflow }}-${{ github.ref || github.run_id }} - cancel-in-progress: true - -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: - - name: Maximize build space - uses: ublue-os/remove-unwanted-software@v6 - - # Checkout push-to-registry action GitHub repository - - name: Checkout Push to Registry action - uses: actions/checkout@v4 - - - name: Verify Arch distrobox - uses: EyeCantCU/cosign-action/verify@v0.2.2 - with: - containers: arch-distrobox:latest - pubkey: https://raw.githubusercontent.com/ublue-os/arch-distrobox/main/cosign.pub - registry: ghcr.io/ublue-os - - # Build metadata - - name: Image Metadata - uses: docker/metadata-action@v5 - 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/arch-toolbox/Containerfile.arch-gnome - 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@v6 - 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 }} - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - if: github.event_name != 'pull_request' - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Sign container - - uses: sigstore/cosign-installer@v3.4.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/.github/workflows/build-arch-toolbox.yml b/.github/workflows/build-arch-toolbox.yml deleted file mode 100644 index 326d099..0000000 --- a/.github/workflows/build-arch-toolbox.yml +++ /dev/null @@ -1,124 +0,0 @@ -name: Build Arch Toolbox (Sernik) Image -on: - schedule: - - cron: '0 19 * * *' # 9:00pm everyday - pull_request: - branches: - - main - paths-ignore: - - '**.md' - - '**.txt' - pull_request_review: - type: [submitted] - push: - branches: - - main - paths-ignore: - - '**.md' - - '**.txt' - merge_group: - workflow_dispatch: -env: - IMAGE_NAME: arch-toolbox - IMAGE_TAGS: latest - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - -concurrency: - group: ${{ github.workflow }}-${{ github.ref || github.run_id }} - cancel-in-progress: true - -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: - - name: Maximize build space - uses: ublue-os/remove-unwanted-software@v6 - - # Checkout push-to-registry action GitHub repository - - name: Checkout Push to Registry action - uses: actions/checkout@v4 - - - name: Verify Arch distrobox - uses: EyeCantCU/cosign-action/verify@v0.2.2 - with: - containers: arch-distrobox:latest - pubkey: https://raw.githubusercontent.com/ublue-os/arch-distrobox/main/cosign.pub - registry: ghcr.io/ublue-os - - # Build metadata - - name: Image Metadata - uses: docker/metadata-action@v5 - 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/arch-toolbox/Containerfile.arch - 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@v6 - 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 }} - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - if: github.event_name != 'pull_request' - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - # Sign container - - uses: sigstore/cosign-installer@v3.4.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/README.md b/README.md index b96dd99..d16b10d 100644 --- a/README.md +++ b/README.md @@ -23,4 +23,4 @@ Ubuntu image that comes with VSCodium, ADB and a few other utilities. Grab it wi ### Arch Sernik -Arch image based off of [bazzite-arch](https://github.com/ublue-os/bazzite-arch) with minor changes to make it a more generalized suitable image. Come with Steam and other gaming related utilities. Grab it with `ghcr.io/sernik-tech/arch-toolbox` (Or `ghcr.io/sernik-tech/arch-gnome-toolbox` for GNOME users). +No longer available. We recommend using [arch-distrobox](https://github.com/ublue-os/arch-distrobox) for an Arch based distrobox image and [bazzite-arch](https://github.com/ublue-os/bazzite-arch) for easy gaming. diff --git a/toolboxes/arch-toolbox/Containerfile.arch b/toolboxes/arch-toolbox/Containerfile.arch deleted file mode 100644 index 62b0d8b..0000000 --- a/toolboxes/arch-toolbox/Containerfile.arch +++ /dev/null @@ -1,73 +0,0 @@ -FROM ghcr.io/ublue-os/arch-distrobox AS arch-toolbox -# Based on bazzite-arch with minor modifications - -COPY toolboxes/arch-toolbox/files / - -# Install gaming related packages and other desktop utilities -# Steam seperated to prevent it from installing its own dependecies -RUN pacman -Syu \ - lib32-vulkan-radeon \ - libva-mesa-driver \ - intel-media-driver \ - vulkan-mesa-layers \ - lib32-vulkan-mesa-layers \ - lib32-libnm \ - openal \ - pipewire \ - pipewire-pulse \ - pipewire-alsa \ - pipewire-jack \ - wireplumber \ - lib32-pipewire \ - lib32-pipewire-jack \ - lib32-libpulse \ - lib32-openal \ - xdg-desktop-portal-kde \ - nano \ - yad \ - xdg-user-dirs \ - xdotool \ - xorg-xwininfo \ - wmctrl \ - wxwidgets-gtk3 \ - rocm-opencl-runtime \ - rocm-hip-runtime \ - libbsd \ - noto-fonts-cjk \ - --noconfirm && \ - pacman -Syu \ - steam \ - mangohud \ - lib32-mangohud \ - --noconfirm && \ - wget https://raw.githubusercontent.com/Shringe/LatencyFleX-Installer/main/install.sh -O /usr/bin/latencyflex && \ - sed -i 's@"dxvk.conf"@"/usr/share/latencyflex/dxvk.conf"@g' /usr/bin/latencyflex && \ - chmod +x /usr/bin/latencyflex - -# Create build user -RUN useradd -m --shell=/bin/bash build && usermod -L build && \ - echo "build ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ - echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - -# Install AUR packages -USER build -WORKDIR /home/build -RUN paru -Syu \ - aur/protontricks \ - aur/vkbasalt \ - aur/lib32-vkbasalt \ - aur/lib32-gperftools \ - aur/steamcmd \ - --noconfirm -USER root -WORKDIR / - -# Cleanup -RUN sed -i 's@ (Runtime)@@g' /usr/share/applications/steam.desktop && \ - userdel -r build && \ - rm -drf /home/build && \ - sed -i '/build ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - sed -i '/root ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - rm -rf \ - /tmp/* \ - /var/cache/pacman/pkg/* diff --git a/toolboxes/arch-toolbox/Containerfile.arch-gnome b/toolboxes/arch-toolbox/Containerfile.arch-gnome deleted file mode 100644 index da669ca..0000000 --- a/toolboxes/arch-toolbox/Containerfile.arch-gnome +++ /dev/null @@ -1,76 +0,0 @@ -FROM ghcr.io/ublue-os/arch-distrobox AS arch-gnome-toolbox -# Based on bazzite-arch with minor modifications -# GNOME edition - -COPY toolboxes/arch-toolbox/files / - -# Install gaming related packages and other desktop utilities -# Steam seperated to prevent it from installing its own dependecies -RUN pacman -Syu \ - lib32-vulkan-radeon \ - libva-mesa-driver \ - intel-media-driver \ - vulkan-mesa-layers \ - lib32-vulkan-mesa-layers \ - lib32-libnm \ - openal \ - pipewire \ - pipewire-pulse \ - pipewire-alsa \ - pipewire-jack \ - wireplumber \ - lib32-pipewire \ - lib32-pipewire-jack \ - lib32-libpulse \ - lib32-openal \ - xdg-desktop-portal-gtk \ - xdg-desktop-portal-gnome \ - nano \ - yad \ - xdg-user-dirs \ - xdotool \ - xorg-xwininfo \ - wmctrl \ - wxwidgets-gtk3 \ - rocm-opencl-runtime \ - rocm-hip-runtime \ - libbsd \ - noto-fonts-cjk \ - --noconfirm && \ - pacman -Syu \ - steam \ - mangohud \ - lib32-mangohud \ - --noconfirm && \ - wget https://raw.githubusercontent.com/Shringe/LatencyFleX-Installer/main/install.sh -O /usr/bin/latencyflex && \ - sed -i 's@"dxvk.conf"@"/usr/share/latencyflex/dxvk.conf"@g' /usr/bin/latencyflex && \ - chmod +x /usr/bin/latencyflex - # Steam/Lutris/Wine installed separately so they use the dependencies above and don't try to install their own. - -# Create build user -RUN useradd -m --shell=/bin/bash build && usermod -L build && \ - echo "build ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ - echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers - -# Install AUR packages -USER build -WORKDIR /home/build -RUN paru -Syu \ - aur/protontricks \ - aur/vkbasalt \ - aur/lib32-vkbasalt \ - aur/lib32-gperftools \ - aur/steamcmd \ - --noconfirm -USER root -WORKDIR / - -# Cleanup -RUN sed -i 's@ (Runtime)@@g' /usr/share/applications/steam.desktop && \ - userdel -r build && \ - rm -drf /home/build && \ - sed -i '/build ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - sed -i '/root ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - rm -rf \ - /tmp/* \ - /var/cache/pacman/pkg/* diff --git a/toolboxes/arch-toolbox/files/usr/share/latencyflex/dxvk.conf b/toolboxes/arch-toolbox/files/usr/share/latencyflex/dxvk.conf deleted file mode 100644 index 1f47c2f..0000000 --- a/toolboxes/arch-toolbox/files/usr/share/latencyflex/dxvk.conf +++ /dev/null @@ -1,2 +0,0 @@ -dxgi.nvapiHack = False -dxgi.customVendorId = 10de