From 27f8fac04744c0050867ab67c3656cf91350655d Mon Sep 17 00:00:00 2001
From: Robert Sturla <robertsturla@outlook.com>
Date: Sat, 11 Jan 2025 20:08:08 +0000
Subject: [PATCH] fix: point to correct upstream image and login to GHCR before
 push (#9)

* fix: point to correct upstream image and login to GHCR before push

* chore: remove Fedora 40
---
 .github/workflows/build.yml               | 7 ++++---
 desktop-environments/cosmic/Containerfile | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 42fbc3e..08e0f33 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        fedora-version: [40, 41]
+        fedora-version: [41]
         desktop-environment: [cosmic]
     permissions:
       contents: read
@@ -41,6 +41,9 @@ jobs:
           major-version: ${{ env.FEDORA_VERSION }}
           is-release: ${{ github.event_name != 'pull_request' }}
 
+      - name: Login to GHCR
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
       - name: Build Image
         id: build
         uses: rsturla/eternal-main/.github/actions/build-image@main
@@ -62,5 +65,3 @@ jobs:
           image-name: ${{ steps.build.outputs.image }}
           image-tags: ${{ steps.build.outputs.tags }}
           image-registry: ${{ env.IMAGE_REGISTRY }}
-          registry-username: ${{ github.actor }}
-          registry-password: ${{ secrets.GITHUB_TOKEN }}
diff --git a/desktop-environments/cosmic/Containerfile b/desktop-environments/cosmic/Containerfile
index 48201ec..0a7d2cc 100644
--- a/desktop-environments/cosmic/Containerfile
+++ b/desktop-environments/cosmic/Containerfile
@@ -1,5 +1,5 @@
 ARG FEDORA_VERSION=40
-ARG FEDORA_EDITION=base
+ARG FEDORA_EDITION=base-atomic
 ARG FEDORA_IMAGE=quay.io/fedora-ostree-desktops/${FEDORA_EDITION}:${FEDORA_VERSION}
 
 FROM ${FEDORA_IMAGE}