From 876895d2e3bc2740631ad62c165fa7ad8178d0e2 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Tue, 13 Feb 2024 21:17:10 -0600 Subject: [PATCH] Remove base build, main builds are base now --- .github/workflows/build.yml | 2 +- .../{build_main.yml => build_silverblue.yml} | 12 +- ...e_main.yml => build_silverblue_nvidia.yml} | 12 +- .../build_silverblue_nvidia_main.yml | 161 ------------------ README.md | 49 +++--- .../fedora-cosmic-atomic-main/Containerfile | 109 ------------ containers/fedora-cosmic-atomic-main/desc.yml | 5 - .../desc.yml | 5 - .../desc.yml | 5 - .../Containerfile | 0 .../desc.yml | 5 + .../Containerfile | 0 .../fedora-cosmic-atomic-silverblue/desc.yml | 5 + containers/fedora-cosmic-atomic/Containerfile | 17 +- containers/fedora-cosmic-atomic/desc.yml | 2 +- 15 files changed, 58 insertions(+), 331 deletions(-) rename .github/workflows/{build_main.yml => build_silverblue.yml} (94%) rename .github/workflows/{build_silverblue_main.yml => build_silverblue_nvidia.yml} (94%) delete mode 100644 .github/workflows/build_silverblue_nvidia_main.yml delete mode 100644 containers/fedora-cosmic-atomic-main/Containerfile delete mode 100644 containers/fedora-cosmic-atomic-main/desc.yml delete mode 100644 containers/fedora-cosmic-atomic-silverblue-main/desc.yml delete mode 100644 containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml rename containers/{fedora-cosmic-atomic-silverblue-nvidia-main => fedora-cosmic-atomic-silverblue-nvidia}/Containerfile (100%) create mode 100644 containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml rename containers/{fedora-cosmic-atomic-silverblue-main => fedora-cosmic-atomic-silverblue}/Containerfile (100%) create mode 100644 containers/fedora-cosmic-atomic-silverblue/desc.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e63f4f..6ec9600 100644 --- 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 b/.github/workflows/build_silverblue.yml similarity index 94% rename from .github/workflows/build_main.yml rename to .github/workflows/build_silverblue.yml index 01448e7..b415f43 100644 --- a/.github/workflows/build_main.yml +++ b/.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 b/.github/workflows/build_silverblue_nvidia.yml similarity index 94% rename from .github/workflows/build_silverblue_main.yml rename to .github/workflows/build_silverblue_nvidia.yml index 54b7b51..2eb069a 100644 --- a/.github/workflows/build_silverblue_main.yml +++ b/.github/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 deleted file mode 100644 index c652007..0000000 --- a/.github/workflows/build_silverblue_nvidia_main.yml +++ /dev/null @@ -1,161 +0,0 @@ -name: build_silverblue_nvidia_main -on: - workflow_dispatch: - -env: - IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - -# Only deploys the branch named "live". Ignores all other branches, to allow -# having "development" branches without interfering with GHCR image uploads. -jobs: - push-ghcr: - name: Build and push image - runs-on: ubuntu-22.04 - permissions: - contents: read - packages: write - id-token: write - strategy: - fail-fast: false - matrix: - arch: [amd64] #add ,arm64 to add back arm build - - steps: - - name: Maximize build space - uses: easimon/maximize-build-space@v10 - with: - root-reserve-mb: 37500 - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' - remove-codeql: 'true' - remove-docker-images: 'true' - - # Checkout push-to-registry action GitHub repository - - name: Checkout Push to Registry action - uses: actions/checkout@v4 - - - name: Add yq (for reading desc.yml) - uses: mikefarah/yq@v4.35.1 - - - name: Gather image data from description - run: | - echo "IMAGE_NAME=$(yq '.name' ./containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml)" >> $GITHUB_ENV - echo "IMAGE_DESCRIPTION=$(yq '.description' ./containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml)" >> $GITHUB_ENV - echo "IMAGE_MAJOR_VERSION=$(yq '.image-version' ./containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml)" >> $GITHUB_ENV - - - name: Get current version - id: labels - run: | - ver=$(skopeo inspect docker://quay.io/fedora/fedora-silverblue:${{ env.IMAGE_MAJOR_VERSION }} | jq -r '.Labels["org.opencontainers.image.version"]') - echo "VERSION=$ver" >> $GITHUB_OUTPUT - - - name: Generate tags - id: generate-tags - shell: bash - run: | - # Generate a timestamp for creating an image version history - TIMESTAMP="$(date +%Y%m%d)" - MAJOR_VERSION="$(echo ${{ steps.labels.outputs.VERSION }} | cut -d . -f 1)" - COMMIT_TAGS=() - BUILD_TAGS=() - # Have tags for tracking builds during pull request - SHA_SHORT="${GITHUB_SHA::7}" - - # Using clever bash string templating, https://stackoverflow.com/q/40771781 - # don't make malformed tags if $MAJOR_VERSION is empty (base-image didn't include proper labels) -- - COMMIT_TAGS+=("pr-${{ github.event.number }}${MAJOR_VERSION:+-$MAJOR_VERSION}-${{ matrix.arch }}") - COMMIT_TAGS+=("${SHA_SHORT}${MAJOR_VERSION:+-$MAJOR_VERSION}-${{ matrix.arch }}") - - BUILD_TAGS=("${MAJOR_VERSION}-${{ matrix.arch }}" "${MAJOR_VERSION:+$MAJOR_VERSION-}${TIMESTAMP}-${{ matrix.arch }}") - # -- - - BUILD_TAGS+=("${TIMESTAMP}-${{ matrix.arch }}") - BUILD_TAGS+=("latest-${{ matrix.arch }}") - - if [[ "${{ github.event_name }}" == "pull_request" ]]; then - echo "Generated the following commit tags: " - for TAG in "${COMMIT_TAGS[@]}"; do - echo "${TAG}" - done - alias_tags=("${COMMIT_TAGS[@]}") - else - alias_tags=("${BUILD_TAGS[@]}") - fi - echo "Generated the following build tags: " - for TAG in "${BUILD_TAGS[@]}"; do - echo "${TAG}" - done - echo "alias_tags=${alias_tags[*]}" >> $GITHUB_OUTPUT - - # Build metadata - - name: Image Metadata - uses: docker/metadata-action@v5 - id: meta - with: - images: | - ${{ env.IMAGE_NAME }} - labels: | - 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.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. - # https://github.com/macbre/push-to-ghcr/issues/12 - - name: Lowercase Registry - id: registry_case - uses: ASzc/change-string-case-action@v6 - with: - string: ${{ env.IMAGE_REGISTRY }} - - - name: Lowercase Image - id: image_case - uses: ASzc/change-string-case-action@v6 - with: - string: ${{ env.IMAGE_NAME }} - - - name: Install qemu dependency - run: | - sudo apt-get update - sudo apt-get install -y qemu-user-static - - # Build image using Buildah action - - name: Build Image - id: build_image - uses: redhat-actions/buildah-build@v2 - with: - containerfiles: | - ./containers/fedora-cosmic-atomic-silverblue-nvidia-main/Containerfile - image: ${{ env.IMAGE_NAME }} - tags: | - ${{ steps.generate-tags.outputs.alias_tags }} - archs: ${{ matrix.arch }} - build-args: | - IMAGE_MAJOR_VERSION=${{ env.IMAGE_MAJOR_VERSION }} - IMAGE_REGISTRY=${{ steps.registry_case.outputs.lowercase }} - labels: ${{ steps.meta.outputs.labels }} - oci: false - - - name: 'Login to GitHub Container Registry' - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{github.actor}} - password: ${{secrets.GITHUB_TOKEN}} - - # Push the image to GHCR (Image Registry) - - name: Push To GHCR - uses: redhat-actions/push-to-registry@v2 - id: push - with: - image: ${{ steps.build_image.outputs.image }} - tags: ${{ steps.build_image.outputs.tags }} - registry: ${{ steps.registry_case.outputs.lowercase }} - extra-args: | - --disable-content-trust - - - name: Echo outputs - run: | - echo "${{ toJSON(steps.push.outputs) }}" \ No newline at end of file diff --git a/README.md b/README.md index 2d74004..61fd127 100644 --- 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. \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic-main/Containerfile b/containers/fedora-cosmic-atomic-main/Containerfile deleted file mode 100644 index 2b513bb..0000000 --- a/containers/fedora-cosmic-atomic-main/Containerfile +++ /dev/null @@ -1,109 +0,0 @@ -ARG IMAGE_MAJOR_VERSION=39 -ARG BASE_IMAGE_URL=quay.io/fedora-ostree-desktops/base - -FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS cosmic-builder - -RUN dnf update -y -RUN dnf install -y git \ - make \ - which \ - just \ - rustc \ - libglvnd-devel \ - libseat-devel \ - libxkbcommon-devel \ - lld \ - libinput-devel \ - glib2-devel \ - gtk3-devel \ - dbus-devel \ - wayland-devel \ - clang-devel \ - cargo \ - mesa-libgbm-devel \ - pipewire-devel \ - pam-devel \ - flatpak-devel \ - rust-rav1e+nasm-rs-devel -RUN git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch -# This is where the magic happens -RUN cd cosmic-epoch && git submodule update --remote && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d - - -FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS launcher-builder - -RUN dnf update -y -RUN dnf install -y git \ - just \ - rustc \ - cargo \ - libglvnd-devel \ - libxkbcommon-devel -RUN git clone --recurse-submodules https://github.com/pop-os/launcher -RUN cd launcher && just build-release - - -FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS wallpapers-builder -RUN dnf update -y -RUN dnf install -y git -RUN git clone --recurse-submodules https://github.com/pop-os/system76-wallpapers - - -FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION} - - -# Cosmic dependencies -RUN rpm-ostree install \ - libseat \ - pop-icon-theme \ - greetd \ - greetd-selinux \ - cage \ - mozilla-fira-mono-fonts \ - mozilla-fira-sans-fonts - -# Optional dependencies (may be removed once they are no longer needed) -RUN rpm-ostree install \ - sddm \ - gnome-keyring - -# sddm: temporary display manager until cosmic-session starts without error -# gnome-keyring: keyring support - -# sddm for now, until cosmic-session is mature - -# Copy COSMIC -COPY --from=cosmic-builder /cosmic-epoch/cosmic-sysext/usr /usr -COPY --from=cosmic-builder /cosmic-epoch/cosmic-comp/config.ron /usr/etc/cosmic-comp/config.ron -COPY --from=cosmic-builder /cosmic-epoch/cosmic-greeter/cosmic-greeter.toml /usr/etc/greetd/cosmic-greeter.toml -COPY --from=cosmic-builder /cosmic-epoch/cosmic-greeter/debian/cosmic-greeter.service /usr/lib/systemd/system/cosmic-greeter.service - -COPY --from=launcher-builder /launcher/target/release/pop-launcher-bin /usr/bin/pop-launcher -COPY --from=launcher-builder /launcher/plugins/src/calc/plugin.ron /usr/lib/pop-launcher/plugins/calc/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/calc/calc -COPY --from=launcher-builder /launcher/plugins/src/cosmic_toplevel/plugin.ron /usr/lib/pop-launcher/plugins/cosmic_toplevel/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/cosmic_toplevel/cosmic-toplevel -COPY --from=launcher-builder /launcher/plugins/src/desktop_entries/plugin.ron /usr/lib/pop-launcher/plugins/desktop_entries/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/desktop_entries/desktop-entries -COPY --from=launcher-builder /launcher/plugins/src/files/plugin.ron /usr/lib/pop-launcher/plugins/files/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/files/files -COPY --from=launcher-builder /launcher/plugins/src/find/plugin.ron /usr/lib/pop-launcher/plugins/find/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/find/find -COPY --from=launcher-builder /launcher/plugins/src/pulse/plugin.ron /usr/lib/pop-launcher/plugins/pulse/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/pulse/pulse -COPY --from=launcher-builder /launcher/plugins/src/recent/plugin.ron /usr/lib/pop-launcher/plugins/recent/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/recent/recent -COPY --from=launcher-builder /launcher/plugins/src/scripts/plugin.ron /usr/lib/pop-launcher/plugins/scripts/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/scripts/scripts -COPY --from=launcher-builder /launcher/plugins/src/terminal/plugin.ron /usr/lib/pop-launcher/plugins/terminal/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/terminal/terminal -COPY --from=launcher-builder /launcher/plugins/src/web/plugin.ron /usr/lib/pop-launcher/plugins/web/plugin.ron -RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/web/web - -COPY --from=wallpapers-builder /system76-wallpapers/backgrounds /usr/share/backgrounds/pop - -# RUN ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service -RUN rm -rf /var/lib/greetd - -RUN rpm-ostree cleanup -m && ostree container commit - diff --git a/containers/fedora-cosmic-atomic-main/desc.yml b/containers/fedora-cosmic-atomic-main/desc.yml deleted file mode 100644 index 69a47fb..0000000 --- a/containers/fedora-cosmic-atomic-main/desc.yml +++ /dev/null @@ -1,5 +0,0 @@ -title: Fedora COSMIC Atomic Main -name: fedora-cosmic-atomic-main -description: Fedora COSMIC Atomic Main ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch. -image-registry: ghcr.io -image-version: 39 \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic-silverblue-main/desc.yml b/containers/fedora-cosmic-atomic-silverblue-main/desc.yml deleted file mode 100644 index 16ee2a5..0000000 --- a/containers/fedora-cosmic-atomic-silverblue-main/desc.yml +++ /dev/null @@ -1,5 +0,0 @@ -title: Fedora COSMIC Atomic Silverblue Main -name: fedora-cosmic-atomic-silverblue-main -description: Fedora COSMIC Atomic Silverblue Main ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch, with a Silverblue base. -image-registry: ghcr.io -image-version: 39 \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml b/containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml deleted file mode 100644 index 0bc251d..0000000 --- a/containers/fedora-cosmic-atomic-silverblue-nvidia-main/desc.yml +++ /dev/null @@ -1,5 +0,0 @@ -title: Fedora COSMIC Atomic Silverblue Nvidia Main -name: fedora-cosmic-atomic-silverblue-nvidia-main -description: Fedora COSMIC Atomic Silverblue Main ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch, with a Silverblue base, and with nvidia drivers. -image-registry: ghcr.io -image-version: 39 \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic-silverblue-nvidia-main/Containerfile b/containers/fedora-cosmic-atomic-silverblue-nvidia/Containerfile similarity index 100% rename from containers/fedora-cosmic-atomic-silverblue-nvidia-main/Containerfile rename to containers/fedora-cosmic-atomic-silverblue-nvidia/Containerfile diff --git a/containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml b/containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml new file mode 100644 index 0000000..a582c46 --- /dev/null +++ b/containers/fedora-cosmic-atomic-silverblue-nvidia/desc.yml @@ -0,0 +1,5 @@ +title: Fedora COSMIC Atomic Silverblue Nvidia +name: fedora-cosmic-atomic-silverblue-nvidia +description: Fedora COSMIC Atomic Silverblue ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch, with a Silverblue base, and with nvidia drivers. +image-registry: ghcr.io +image-version: 39 \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic-silverblue-main/Containerfile b/containers/fedora-cosmic-atomic-silverblue/Containerfile similarity index 100% rename from containers/fedora-cosmic-atomic-silverblue-main/Containerfile rename to containers/fedora-cosmic-atomic-silverblue/Containerfile diff --git a/containers/fedora-cosmic-atomic-silverblue/desc.yml b/containers/fedora-cosmic-atomic-silverblue/desc.yml new file mode 100644 index 0000000..584befa --- /dev/null +++ b/containers/fedora-cosmic-atomic-silverblue/desc.yml @@ -0,0 +1,5 @@ +title: Fedora COSMIC Atomic Silverblue +name: fedora-cosmic-atomic-silverblue +description: Fedora COSMIC Atomic Silverblue ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch, with a Silverblue base. +image-registry: ghcr.io +image-version: 39 \ No newline at end of file diff --git a/containers/fedora-cosmic-atomic/Containerfile b/containers/fedora-cosmic-atomic/Containerfile index a5edbff..123cddf 100644 --- a/containers/fedora-cosmic-atomic/Containerfile +++ b/containers/fedora-cosmic-atomic/Containerfile @@ -23,9 +23,11 @@ RUN dnf install -y git \ mesa-libgbm-devel \ pipewire-devel \ pam-devel \ - flatpak-devel + flatpak-devel \ + rust-rav1e+nasm-rs-devel RUN git clone --recurse-submodules https://github.com/pop-os/cosmic-epoch -RUN cd cosmic-epoch && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d +# This is where the magic happens +RUN cd cosmic-epoch && git submodule update --remote && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS launcher-builder @@ -58,10 +60,7 @@ RUN rpm-ostree install \ greetd-selinux \ cage \ mozilla-fira-mono-fonts \ - mozilla-fira-sans-fonts \ - sddm - -# TODO: Remove SDDM once cosmic-greeter is stable + mozilla-fira-sans-fonts # Copy COSMIC COPY --from=cosmic-builder /cosmic-epoch/cosmic-sysext/usr /usr @@ -93,11 +92,7 @@ RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/web/web COPY --from=wallpapers-builder /system76-wallpapers/backgrounds /usr/share/backgrounds/pop -# RUN ln -s /usr/lib/systemd/system/gdm.service /etc/systemd/system/display-manager.service - +RUN ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service RUN rm -rf /var/lib/greetd -# TODO: Reenable once cosmic-greeter is reenabled - RUN rpm-ostree cleanup -m && ostree container commit - diff --git a/containers/fedora-cosmic-atomic/desc.yml b/containers/fedora-cosmic-atomic/desc.yml index 0b466ef..60fd84f 100644 --- a/containers/fedora-cosmic-atomic/desc.yml +++ b/containers/fedora-cosmic-atomic/desc.yml @@ -1,5 +1,5 @@ title: Fedora COSMIC Atomic name: fedora-cosmic-atomic -description: Fedora COSMIC Atomic ships the pre-alpha COSMIC desktop environment in an atomic fashion. +description: Fedora COSMIC Atomic ships the pre-alpha COSMIC desktop environment in an atomic fashion, with all the submodules updated to their master/main branch. image-registry: ghcr.io image-version: 39 \ No newline at end of file