From 2e6f6c3ccd37ee04b4a3b95315781a03e67209b4 Mon Sep 17 00:00:00 2001 From: mirkobrombin Date: Thu, 1 Aug 2024 06:06:13 +0200 Subject: [PATCH] chore: update references from nvidia to nvidia-propietary --- .github/workflows/differ.yml | 8 ++++---- .github/workflows/vib-build.yml | 2 +- README.md | 7 +++++-- includes.container/usr/share/abroot/abroot.json | 2 +- recipe.yml | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/differ.yml b/.github/workflows/differ.yml index d27819f..59823af 100644 --- a/.github/workflows/differ.yml +++ b/.github/workflows/differ.yml @@ -10,8 +10,8 @@ jobs: differ: runs-on: ubuntu-latest container: - image: ghcr.io/vanilla-os/nvidia:main - if: github.repository == 'vanilla-os/nvidia-image' + image: ghcr.io/vanilla-os/nvidia-propietary:main + if: github.repository == 'vanilla-os/nvidia-propietary-image' steps: - uses: actions/checkout@v4 @@ -24,10 +24,10 @@ jobs: IMAGE_DIGEST=$(curl -s -L -H "Accept: application/vnd.github+json" \ -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ -H "X-GitHub-Api-Version: 2022-11-28" \ - https://api.github.com/orgs/Vanilla-OS/packages/container/nvidia/versions | grep -m1 name | sed -E 's/^\s*"name": "(.+)".*$/\1/') + https://api.github.com/orgs/Vanilla-OS/packages/container/nvidia-propietary/versions | grep -m1 name | sed -E 's/^\s*"name": "(.+)".*$/\1/') curl -X POST \ -H 'Accept:application/json' \ -H "Authorization:Basic $(echo -n "${{ secrets.DIFFER_USER }}:${{ secrets.DIFFER_PSW }}" | base64)" \ -d "{\"digest\":\"${IMAGE_DIGEST}\",${PACKAGE_LIST}}" \ - ${{ vars.DIFFER_URL }}/images/nvidia/new + ${{ vars.DIFFER_URL }}/images/nvidia-propietary/new lpkg --lock diff --git a/.github/workflows/vib-build.yml b/.github/workflows/vib-build.yml index ef0e3fd..81e755e 100644 --- a/.github/workflows/vib-build.yml +++ b/.github/workflows/vib-build.yml @@ -49,7 +49,7 @@ jobs: run: | REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV" - echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/nvidia" >> "$GITHUB_ENV" + echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/nvidia-propietary" >> "$GITHUB_ENV" - name: Docker meta id: docker_meta diff --git a/README.md b/README.md index 9ce5fcf..fd52731 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ -# Vanilla OS Nvidia Image +# Vanilla OS Nvidia Propietary Image -Containerfile for building a Vanilla OS Desktop + Nvidia image. +Containerfile for building a Vanilla OS Desktop + Nvidia Propietary (for old GPUs) image. + +> [!NOTE] +> This image will be enabled in the Vanilla OS installer only if [this](https://github.com/Vanilla-OS/nvidia-image/pull/43) gets merged, making the main NVIDIA image using the official open-source drivers. This image is based on top of [`vanillaos/desktop`](https://github.com/Vanilla-OS/desktop-image/pkgs/container/desktop) and offers the default Vanilla OS Desktop experience with GNOME and Nvidia drivers. diff --git a/includes.container/usr/share/abroot/abroot.json b/includes.container/usr/share/abroot/abroot.json index 6646d2d..ba06a0a 100644 --- a/includes.container/usr/share/abroot/abroot.json +++ b/includes.container/usr/share/abroot/abroot.json @@ -5,7 +5,7 @@ "registry": "ghcr.io", "registryService": "registry.ghcr.io", "registryAPIVersion": "v2", - "name": "vanilla-os/nvidia", + "name": "vanilla-os/nvidia-propietary", "tag": "main", "iPkgMngPre": "lpkg --unlock", diff --git a/recipe.yml b/recipe.yml index a67809a..5a4a729 100644 --- a/recipe.yml +++ b/recipe.yml @@ -1,5 +1,5 @@ -name: Vanilla Desktop Nvidia -id: nvidia +name: Vanilla Desktop Nvidia Proprietary +id: nvidia-propietary stages: - id: build base: ghcr.io/vanilla-os/desktop:main