Skip to content

Commit

Permalink
chore: update references from nvidia to nvidia-propietary
Browse files Browse the repository at this point in the history
  • Loading branch information
mirkobrombin committed Aug 1, 2024
1 parent b245ce9 commit 2e6f6c3
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/differ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/vib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion includes.container/usr/share/abroot/abroot.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions recipe.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 2e6f6c3

Please sign in to comment.