Skip to content

Commit

Permalink
Fixed some oopsies
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxwelldoug committed Jul 16, 2024
1 parent 834c4fe commit 0fd7a27
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 42 deletions.
4 changes: 0 additions & 4 deletions .github/FUNDING.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/BUG-REPORT.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -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."
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
```
40 changes: 20 additions & 20 deletions includes.container/usr/share/abroot/abroot.json
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions recipe.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit 0fd7a27

Please sign in to comment.