Skip to content

Commit 3cbde97

Browse files
committed
feat: rename stable container tag to latest
1 parent 7a928b5 commit 3cbde97

3 files changed

Lines changed: 22 additions & 17 deletions

File tree

.github/workflows/vib-build.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- 'dev'
7+
- 'vision'
78
tags:
89
- '*'
910
workflow_dispatch:
@@ -20,7 +21,7 @@ jobs:
2021
- name: Verify Base Image Integrity
2122
if: ${{ github.ref_type == 'tag' }}
2223
run:
23-
gh attestation verify oci://ghcr.io/vanilla-os/desktop:main --owner Vanilla-OS
24+
gh attestation verify oci://ghcr.io/vanilla-os/gnome:latest --owner Vanilla-OS
2425
env:
2526
GH_TOKEN: ${{ github.token }}
2627

@@ -44,9 +45,14 @@ jobs:
4445
- uses: actions/checkout@v4
4546

4647
- name: Change tag in recipe
47-
if: ${{ github.ref_type == 'tag' }}
48+
if: ${{ github.ref_type != 'tag' }}
4849
run: |
49-
sed 's/ghcr.io\/vanilla-os\/desktop:dev/ghcr.io\/vanilla-os\/desktop:main/' -i recipe.yml
50+
if [ -n "${{ github.base_ref }}" ]; then
51+
TAG="${{ github.base_ref }}"
52+
else
53+
TAG="${{ github.ref_name }}"
54+
fi
55+
sed "s/ghcr.io\/vanilla-os\/gnome:latest/ghcr.io\/vanilla-os\/gnome:$TAG/" -i recipe.yml
5056
5157
- uses: vanilla-os/vib-gh-action@v1.1.0
5258
with:
@@ -62,7 +68,7 @@ jobs:
6268
run: |
6369
REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')"
6470
echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
65-
echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/nvidia-exp" >> "$GITHUB_ENV"
71+
echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/gnome-nvidia-open" >> "$GITHUB_ENV"
6672
6773
- name: Docker meta
6874
id: meta
@@ -139,7 +145,7 @@ jobs:
139145
run: |
140146
REPO_OWNER_LOWERCASE="$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')"
141147
echo "REPO_OWNER_LOWERCASE=$REPO_OWNER_LOWERCASE" >> "$GITHUB_ENV"
142-
echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/nvidia-exp" >> "$GITHUB_ENV"
148+
echo "IMAGE_URL=ghcr.io/$REPO_OWNER_LOWERCASE/gnome-nvidia-open" >> "$GITHUB_ENV"
143149
144150
- name: Download digests
145151
uses: actions/download-artifact@v4
@@ -156,7 +162,8 @@ jobs:
156162
- name: Extra image tag release
157163
if: ${{ github.ref_type == 'tag' }}
158164
run: |
159-
echo "EXTRA_TAG=raw,main" >> "$GITHUB_ENV"
165+
echo "EXTRA_TAG=raw,latest" >> "$GITHUB_ENV"
166+
echo "IMAGE_TAG_LEGACY=${IMAGE_URL/gnome-nvidia-open/nvidia-exp}:main" >> "$GITHUB_ENV"
160167
161168
- name: Docker meta
162169
id: meta
@@ -184,4 +191,5 @@ jobs:
184191
working-directory: ${{ runner.temp }}/digests
185192
run: |
186193
docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
194+
${IMAGE_TAG_LEGACY:+-t $IMAGE_TAG_LEGACY} \
187195
$(printf '${{ env.IMAGE_URL }}@sha256:%s ' *)

README.md

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
# Vanilla OS Nvidia Experimental Image
1+
# Vanilla OS GNOME NVIDIA Open Image
22

3-
Containerfile for building a Vanilla OS Desktop + Nvidia image.
3+
Containerfile for building a Vanilla OS GNOME + NVIDIA image.
44

5-
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.
5+
This image is based on top of [`vanillaos/gnome`](https://github.com/Vanilla-OS/desktop-image/pkgs/container/gnome) and offers the default Vanilla OS Desktop experience with GNOME and open flavor NVIDIA drivers.
66

77
## Build
88

9-
> [!NOTE]
10-
> The fsguard compiled plugin `.so` file should be downloaded from the [latest release](https://github.com/Vanilla-OS/vib-fsguard/releases/latest) and be placed under a `plugins` directory beside the `recipe.yml` file.
11-
129
```bash
1310
vib build recipe.yml
14-
podman image build -t vanillaos/nvidia-exp .
11+
podman image build -t vanillaos/gnome-nvidia-open .
1512
```
1613

1714
## Verify Image Build Provenance Attestation
1815

1916
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:
2017

2118
```sh
22-
gh attestation verify oci://ghcr.io/vanilla-os/nvidia-exp:main --owner Vanilla-OS
19+
gh attestation verify oci://ghcr.io/vanilla-os/gnome-nvidia-open:latest --owner Vanilla-OS
2320
```

recipe.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: Vanilla Desktop Nvidia Experimental
2-
id: nvidia-exp
1+
name: Vanilla GNOME NVIDIA Open
2+
id: gnome-nvidia-open
33
vibversion: 1.1.0
44

55
stages:
66
- id: build
7-
base: ghcr.io/vanilla-os/desktop:dev
7+
base: ghcr.io/vanilla-os/gnome:latest
88
addincludes: true
99
singlelayer: false
1010
labels:

0 commit comments

Comments
 (0)