Remove base build, main builds are base now

ublue-os · Feb 14, 2024 · 876895d · 876895d
1 parent 58c0e90
commit 876895d
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 331 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
             org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }}
-            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/infinity/main/README.md
+            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/fedora-cosmic-atomic/main/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/56272643?s=200&v=4
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.

diff --git a/.github/workflows/build_main.yml → .github/workflows/build_silverblue.yml b/.github/workflows/build_main.yml → .github/workflows/build_silverblue.yml
@@ -1,4 +1,4 @@
-name: build_main
+name: build_silverblue
 on:
   workflow_dispatch:
 
@@ -40,9 +40,9 @@ jobs:
 
       - name: Gather image data from description
         run: |
-          echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic-main/desc.yml)" >> $GITHUB_ENV
-          echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic-main/desc.yml)" >> $GITHUB_ENV
-          echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic-main/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic-silverblue/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic-silverblue/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic-silverblue/desc.yml)" >> $GITHUB_ENV
 
       - name: Get current version
         id: labels
@@ -99,7 +99,7 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
             org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }}
-            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/infinity/main/README.md
+            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/fedora-cosmic-atomic/main/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/56272643?s=200&v=4
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
@@ -127,7 +127,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: |
-            ./containers/fedora-cosmic-atomic-main/Containerfile
+            ./containers/fedora-cosmic-atomic-silverblue/Containerfile
           image: ${{ env.IMAGE_NAME }}
           tags: |
             ${{ steps.generate-tags.outputs.alias_tags }}

diff --git a/.github/workflows/build_silverblue_main.yml → ...hub/workflows/build_silverblue_nvidia.yml b/.github/workflows/build_silverblue_main.yml → ...hub/workflows/build_silverblue_nvidia.yml
@@ -1,4 +1,4 @@
-name: build_silverblue_main
+name: build_silverblue_nvidia
 on:
   workflow_dispatch:
 
@@ -40,9 +40,9 @@ jobs:
 
       - name: Gather image data from description
         run: |
-          echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic-silverblue-main/desc.yml)" >> $GITHUB_ENV
-          echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic-silverblue-main/desc.yml)" >> $GITHUB_ENV
-          echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic-silverblue-main/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml)" >> $GITHUB_ENV
+          echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml)" >> $GITHUB_ENV
 
       - name: Get current version
         id: labels
@@ -99,7 +99,7 @@ jobs:
             org.opencontainers.image.title=${{ env.IMAGE_NAME }}
             org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
             org.opencontainers.image.description=${{ env.IMAGE_DESCRIPTION }}
-            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/infinity/main/README.md
+            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ryanabx/fedora-cosmic-atomic/main/README.md
             io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/56272643?s=200&v=4
 
       # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR.
@@ -127,7 +127,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           containerfiles: |
-            ./containers/fedora-cosmic-atomic-silverblue-main/Containerfile
+            ./containers/fedora-cosmic-atomic-silverblue-nvidia/Containerfile
           image: ${{ env.IMAGE_NAME }}
           tags: |
             ${{ steps.generate-tags.outputs.alias_tags }}

diff --git a/.github/workflows/build_silverblue_nvidia_main.yml b/.github/workflows/build_silverblue_nvidia_main.yml
diff --git a/README.md b/README.md
@@ -1,32 +1,39 @@
-## A Fedora Atomic Desktop based OSTree image with the [COSMIC](https://github.com/pop-os/cosmic-epoch) desktop environment.
+# Fedora Cosmic Atomic
+### Fedora Silverblue-based Atomic Desktop with the Pre-Alpha Cosmic Desktop Environment Included!
 
-This project has no association with **System76** and is not an officially endorsed installation method.
+Like Fedora? Want to try the latest from the work in progress Cosmic Desktop Environment? Want to help find bugs and/or contribute to Cosmic development, but don't want to work in a VM or install Pop!_OS? None of the above things but something else??!?
 
-## Pre-Install
+Go ahead and try one of the ostree images I've created here!
 
-1. Install Fedora Atomic variant:
-  [Silverblue](https://fedoraproject.org/atomic-desktops/silverblue/)
-  [Kinoite](https://fedoraproject.org/atomic-desktops/kinoite/)
-2. Disable SELinux (edit `/etc/selinux/config`)
+### Installation
 
-## Install Image
-### cosmic-epoch without upgraded submodules (recommended)
-Run `sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ryanabx/fedora-cosmic-atomic:latest-amd64`
-### cosmic-epoch with upgraded submodes (all submodules at their master branch, latest commit) (for real tinkerers ;D)
-Run `sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ryanabx/fedora-cosmic-atomic-main:latest-amd64`
-> Note: This package is still updated whenever I (ryanabx) have time, but you may use the containerfile to build your own image if you need the latest and greatest off my schedule!
+1. Install an rpm-ostree based desktop, like [Fedora Silverblue](https://fedoraproject.org/atomic-desktops/silverblue/) (aka atomic desktops)
+2. Disable SELinux (edit `/etc/selinux/config`) (note: not recommended for production, but necessary for these images)
+3. Install one of the images listed below!
 
-Thanks to Drakulix for the original image. Differences from her image:
-* The image is based on Fedora's Base image instead of SilverBlue
-* `cosmic-greeter` is swapped out with `SDDM` for the time being, as there's a problem that doesn't let cosmic-greeter start at the moment (see: https://github.com/pop-os/cosmic-greeter/issues/8)
-* More up-to-date at the moment (hers is 3 months old)
+### Images
 
-## Obligatory neofetch
-![Neofetch of COSMIC desktop in Fedora](./screenshot/1.png)
+#### Recommended Images (Silverblue Based)
+
+Silverblue-based w/ COSMIC (default)
+
+    sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ryanabx/fedora-cosmic-atomic-silverblue:latest-amd64
+
+Silverblue-based w/ COSMIC & NVIDIA Drivers
+
+    sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ryanabx/fedora-cosmic-atomic-silverblue-nvidia:latest-amd64
 
+#### Not Recommended (Base Fedora Image, no Silverblue)
+
+Base Fedora Image w/ COSMIC
+
+    sudo rpm-ostree rebase ostree-unverified-registry:ghcr.io/ryanabx/fedora-cosmic-atomic:latest-amd64
+
+### Neofetch
+![Neofetch of COSMIC desktop in Fedora](./screenshot/1.png)
 
-## Issues
+### Issues
 
-For issues with the container, feel free to submit an issue on this repo. For COSMIC related issues, please see https://github.com/pop-os/cosmic-epoch
+For issues with the containers, feel free to submit an issue on this repo. For COSMIC related issues, please see https://github.com/pop-os/cosmic-epoch
 
 > Note: The COSMIC Desktop Environment is still PRE ALPHA. Do not daily drive this image on your main workstation unless you know what you're doing.