From 0fd7a27219adb5367ea1885745110666cb042b19 Mon Sep 17 00:00:00 2001 From: MaxwellDoug Date: Tue, 16 Jul 2024 20:14:49 -0300 Subject: [PATCH] Fixed some oopsies --- .github/FUNDING.yml | 4 -- .github/ISSUE_TEMPLATE/BUG-REPORT.yml | 3 +- .github/ISSUE_TEMPLATE/config.yml | 7 ---- README.md | 12 +++--- .../usr/share/abroot/abroot.json | 40 +++++++++---------- recipe.yml | 6 +-- 6 files changed, 30 insertions(+), 42 deletions(-) delete mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 25a690f..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,4 +0,0 @@ -# These are supported funding model platforms - -github: vanilla-os -liberapay: fabricators diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml index 1c1850a..ad51be7 100644 --- a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml +++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml @@ -35,11 +35,10 @@ body: - type: dropdown id: os-version attributes: - label: On what version of Vanilla OS this happens? + label: On what version of Kanola does this happen? description: | You can look it up in the Settings app, at the bottom of the About page. options: - - "22.10" - "Unreleased" validations: required: true diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 9efe7bb..0086358 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1 @@ blank_issues_enabled: true -contact_links: - - name: "Discord Server" - url: https://vanillaos.org/community - about: "Consider joining the Discord Server to discuss your issue, question or suggestion with the community before opening an issue." - - name: "r/vanillaos Subreddit" - url: https://www.reddit.com/r/vanillaos - about: "Consider joining the r/vanillaos subreddit to discuss your issue, question or suggestion with the community before opening an issue." diff --git a/README.md b/README.md index 3363d35..02daee6 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Vanilla OS Nvidia Image +# Kanola Nvidia Image -Containerfile for building a Vanilla OS Desktop + Nvidia image. +Containerfile for building a Kanola Desktop + Nvidia image. -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. +This image is based on top of [`kanola-images/plasma`](https://github.com/Kanola-Images/Kanola/pkgs/container/plasma) and offers the default Kanola Desktop experience with GNOME and Nvidia drivers. ## Build @@ -11,13 +11,13 @@ This image is based on top of [`vanillaos/desktop`](https://github.com/Vanilla-O ```bash vib build recipe.yml -podman image build -t vanillaos/nvidia . +podman image build -t kanola-images/nplasma . ``` ## Verify Image Build Provenance Attestation -All the image builds/pushes are attested for build provenance and integrity using the [attest-build-provenance`](https://github.com/actions/attest-build-provenance) action. The attestations can be verified [here](https://github.com/Vanilla-OS/nvidia-image/attestations) or by having the latest version of [GitHub CLI](https://github.com/cli/cli/releases/latest) installed in your system. Then, execute the following command: +All the image builds/pushes are attested for build provenance and integrity using the [attest-build-provenance`](https://github.com/actions/attest-build-provenance) action. The attestations can be verified [here](https://github.com/Kanola-Images/Kanola-Nvidia/attestations) or by having the latest version of [GitHub CLI](https://github.com/cli/cli/releases/latest) installed in your system. Then, execute the following command: ```sh -gh attestation verify oci://ghcr.io/vanilla-os/nvidia:main --owner Vanilla-OS +gh attestation verify oci://ghcr.io/kanola-images/nplasma:main --owner Kanola-Images ``` diff --git a/includes.container/usr/share/abroot/abroot.json b/includes.container/usr/share/abroot/abroot.json index 6646d2d..46ca186 100644 --- a/includes.container/usr/share/abroot/abroot.json +++ b/includes.container/usr/share/abroot/abroot.json @@ -1,27 +1,27 @@ { - "autoRepair": true, - "maxParallelDownloads": 2, + "autoRepair": true, + "maxParallelDownloads": 2, - "registry": "ghcr.io", - "registryService": "registry.ghcr.io", - "registryAPIVersion": "v2", - "name": "vanilla-os/nvidia", - "tag": "main", + "registry": "ghcr.io", + "registryService": "registry.ghcr.io", + "registryAPIVersion": "v2", + "name": "kanola-images/nplasma", + "tag": "main", - "iPkgMngPre": "lpkg --unlock", - "iPkgMngPost": "lpkg --lock", - "iPkgMngAdd": "apt-get install -y", - "iPkgMngRm": "apt-get remove -y --autoremove", - "iPkgMngApi": "https://packages.vanillaos.org/api/pkg/{packageName}", - "iPkgMngStatus": 2, + "iPkgMngPre": "lpkg --unlock", + "iPkgMngPost": "lpkg --lock", + "iPkgMngAdd": "apt-get install -y", + "iPkgMngRm": "apt-get remove -y --autoremove", + "iPkgMngApi": "https://packages.vanillaos.org/api/pkg/{packageName}", + "iPkgMngStatus": 2, - "differURL": "https://differ.vanillaos.org", + "differURL": "https://differ.vanillaos.org", - "partLabelVar": "vos-var", - "partLabelA": "vos-a", - "partLabelB": "vos-b", - "partLabelBoot": "vos-boot", - "partLabelEfi": "vos-efi", + "partLabelVar": "vos-var", + "partLabelA": "vos-a", + "partLabelB": "vos-b", + "partLabelBoot": "vos-boot", + "partLabelEfi": "vos-efi", - "libPathStates": "/var/lib/abroot/states" + "libPathStates": "/var/lib/abroot/states" } diff --git a/recipe.yml b/recipe.yml index 5c4ff7e..5bdd2af 100644 --- a/recipe.yml +++ b/recipe.yml @@ -1,11 +1,11 @@ -name: Vanilla Desktop Nvidia -id: nvidia +name: Kanola Nvidia +id: nplasma stages: - id: build base: ghcr.io/kanola-images/plasma:main singlelayer: false labels: - maintainer: Vanilla OS Contributors + maintainer: Kanola Contributors args: DEBIAN_FRONTEND: noninteractive runs: