Drelbsify

drelbszoomer · Jul 5, 2024 · 0ca25e2 · 0ca25e2
1 parent 7119951
commit 0ca25e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build Bazzite
+name: Build DrelbsOS
 on:
   pull_request:
     branches:
@@ -48,7 +48,7 @@ jobs:
       fail-fast: false
       matrix:
         base_image_flavor: [main]
-        base_name: [bazzite, bazzite-nvidia]
+        base_name: [drelbsos, drelbsos-nvidia]
         base_image_name: [silverblue]
         target_image_flavor: [main]
         fedora_version: [40]
@@ -60,7 +60,7 @@ jobs:
     steps:
       - name: Define env.IMAGE_FLAVOR
         run: |
-          if [[ "${{ matrix.base_name }}" == "bazzite-nvidia" ]]; then
+          if [[ "${{ matrix.base_name }}" == "drelbsos-nvidia" ]]; then
               if [[ "${{ matrix.target_image_flavor }}" == "main" ]]; then
                   echo "IMAGE_FLAVOR=nvidia" >> $GITHUB_ENV
               else
@@ -77,18 +77,10 @@ jobs:
               DESKTOP="-gnome"
           fi
 
-          if [[ "${{ matrix.base_name }}" == "bazzite-deck" ]]; then
-              if [[ "${{ matrix.target_image_flavor }}" == "asus" ]]; then
-                  echo "IMAGE_NAME=${{ format('{0}{1}', 'bazzite-ally', '${DESKTOP}') }}" >> $GITHUB_ENV
-              else
-                  echo "IMAGE_NAME=${{ format('{0}{1}', 'bazzite-deck', '${DESKTOP}') }}" >> $GITHUB_ENV
-              fi
+          if [[ "${{ env.IMAGE_FLAVOR }}" == "main" ]]; then
+              echo "IMAGE_NAME=${{ format('{0}{1}', 'drelbsos', '${DESKTOP}') }}" >> $GITHUB_ENV
           else
-              if [[ "${{ env.IMAGE_FLAVOR }}" == "main" ]]; then
-                  echo "IMAGE_NAME=${{ format('{0}{1}', 'bazzite', '${DESKTOP}') }}" >> $GITHUB_ENV
-              else
-                  echo "IMAGE_NAME=${{ format('{0}{1}-{2}', 'bazzite', '${DESKTOP}', env.IMAGE_FLAVOR) }}" >> $GITHUB_ENV
-              fi
+              echo "IMAGE_NAME=${{ format('{0}{1}-{2}', 'drelbsos', '${DESKTOP}', env.IMAGE_FLAVOR) }}" >> $GITHUB_ENV
           fi
 
       - name: Verify main image
@@ -228,8 +220,8 @@ jobs:
             org.opencontainers.image.description=DrelbsOS is an OCI image that serves as an alternative operating system for desktop computers.
             org.opencontainers.image.version=${{ env.SOURCE_IMAGE_VERSION }}
             ostree.linux=${{ env.KERNEL_VERSION }}
-            io.artifacthub.package.readme-url=https://bazzite.gg/
-            io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png
+            # io.artifacthub.package.readme-url=https://bazzite.gg/
+            # io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png
 
       # Build image using Buildah action
       - name: Build Image

diff --git a/Containerfile b/Containerfile
@@ -10,9 +10,9 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} as akmods
 FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} as akmods-extra
 
-FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
+FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS drelbsos
 
-ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}"
+ARG IMAGE_NAME="${IMAGE_NAME:-drelbsos}"
 ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
 ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"
@@ -409,9 +409,9 @@ RUN rm -f /etc/profile.d/toolbox.sh && \
     ostree container commit
 
 FROM ghcr.io/ublue-os/akmods-nvidia:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} as nvidia-akmods
-FROM bazzite as bazzite-nvidia
+FROM drelbsos as drelbsos-nvidia
 
-ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}"
+ARG IMAGE_NAME="${IMAGE_NAME:-drelbsos-nvidia}"
 ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
 ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
 ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"