Revert "test"

This reverts commit 41cedf9f9e.

.forgejo/workflows/cleanup.yml

@@ -0,0 +1,43 @@
+name: Clean up Forgejo Container Registry
+
+on:
+  schedule:
+    - cron: '0 0 * * 0' # Runs every Sunday at midnight
+  workflow_dispatch: # Allows manual triggering
+
+jobs:
+  delete-old-images:
+    runs-on: almalinux-10
+    steps:
+      - name: Delete old versions
+        run: |
+          REGISTRY="forge.pc-rytteren.dk"
+          OWNER="${{ github.repository_owner }}"
+          IMAGE="my-ostree-os"
+          MIN_KEEP=50
+          TOKEN="${{ secrets.PACKAGE_TOKEN }}"
+
+          # Fetch all container packages with this name, sorted oldest first (by id)
+          # API returns a list of package objects, each with "id" and "version"
+          RAW=$(curl -s -H "Authorization: token ${TOKEN}" \
+            "https://${REGISTRY}/api/v1/packages/${OWNER}?type=container&q=${IMAGE}&limit=200")
+
+          # Filter only packages with the correct name and extract id, sort oldest first
+          IDS=$(echo "$RAW" | tr '{' '\n' | grep "\"name\":\"${IMAGE}\"" | \
+            sed 's/.*"id":\([0-9]*\).*/\1/' | sort -n)
+
+          TOTAL=$(echo "$IDS" | grep -c '[0-9]' || true)
+          echo "Found ${TOTAL} packages total, keeping ${MIN_KEEP}"
+
+          if [ "$TOTAL" -le "$MIN_KEEP" ]; then
+            echo "No packages to delete"
+            exit 0
+          fi
+
+          # Delete the oldest (lowest ids) beyond MIN_KEEP
+          TO_DELETE=$(echo "$IDS" | head -n $(( TOTAL - MIN_KEEP )))
+          for ID in $TO_DELETE; do
+            echo "Deleting package id: ${ID}"
+            curl -s -X DELETE -H "Authorization: token ${TOKEN}" \
+              "https://${REGISTRY}/api/v1/packages/${OWNER}/${ID}"
+          done

.forgejo/workflows/os.yml

@@ -24,7 +24,6 @@ jobs:
     permissions:
       contents: read
       packages: write
-      id-token: write # Påkrævet til cosign keyless signering
 
     steps:
 
@@ -44,6 +43,7 @@ jobs:
           tags: |
             type=ref,event=branch
             type=raw,value=latest,enable={{is_default_branch}}
+            type=raw,value=${{ github.ref_name }}
             type=raw,value=${{ github.ref_name }}-10
             type=raw,value=${{ github.ref_name }}-10.${{ steps.date.outputs.date }}
 
@@ -57,13 +57,9 @@ jobs:
         run: |
           # Vi bygger med 'raw-img' lokalt
           buildah bud \
-            --label "org.opencontainers.image.source=https://forge.pc-rytteren.dk/${{ github.repository }}" \
+            --label "org.opencontainers.image.source=https://pc-rytteren.dk/forge/${{ github.repository }}" \
             -t raw-img .
 
-          # Gem det primære tag til signering (vi tager det første fra listen)
-          PRIMARY_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n 1)
-          echo "primary_tag=$PRIMARY_TAG" >> $FORGEJO_OUTPUT
-
       - name: Push to Forgejo Container Registry
         if: github.event_name != 'pull_request'
         run: |
@@ -73,18 +69,3 @@ jobs:
             buildah push "$tag"
           done
 
-      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@v3.3.0
-
-      - name: Log into Forgejo Container Registry (Cosign)
-        if: github.event_name != 'pull_request'
-        run: |
-          cosign login ${{ env.REGISTRY }} -u ${{ github.actor }} -p ${{ secrets.PACKAGE_TOKEN }}
-
-      - name: Sign image
-        if: github.event_name != 'pull_request'
-        run: |
-          # Vi signerer det primære tag.
-          # Vi bruger --yes til at acceptere betingelserne automatisk.
-          cosign sign --yes "${{ steps.build-image.outputs.primary_tag }}"

.github/workflows/cleanup.yml

@@ -1,21 +0,0 @@
-name: Ryd op i GHCR
-
-on:
-  schedule:
-    - cron: '0 0 * * 0' # Kører hver søndag ved midnat
-  workflow_dispatch: # Gør det muligt at køre den manuelt
-
-jobs:
-  delete-old-images:
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-    steps:
-      - name: Slet gamle versioner
-        uses: actions/delete-package-versions@v5
-        with:
-          package-name: 'my-ostree-os' # Skift til dit image navn
-          package-type: 'container'
-          min-versions-to-keep: 50
-          delete-only-untagged-versions: 'false'
-          token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -84,6 +84,10 @@ RUN dnf install vlc vlc-plugins-freeworld vlc-plugin-pipewire -y
 RUN dnf config-manager --add-repo https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo -y
 RUN dnf install brave-browser -y
 
+RUN dnf install rclone -y
+
+RUN dnf install https://github.com/trapexit/mergerfs/releases/download/2.41.1/mergerfs-2.41.1-1.el10.x86_64.rpm -y
+
 RUN systemctl enable docker
 RUN systemctl enable scx_loader
 
@@ -92,7 +96,7 @@ COPY usr /usr
 
 RUN systemctl enable waydroid-choose-intel-gpu.service
 
-RUN cd /usr/bin && wget https://raw.githubusercontent.com/CachyOS/CachyOS-Settings/refs/heads/master/usr/bin/kerver && chmod +x kerver
+# Disable SELinux
+RUN sed -i "s/^SELINUX=.*$/SELINUX=permissive/g" /etc/sysconfig/selinux && sed -i "s/^SELINUX=.*$/SELINUX=permissive/g" /etc/selinux/config
 
-RUN rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp && \
-    bootc container lint
+RUN rm -rf /tmp/* /var/* && mkdir -p /var/tmp && chmod -R 1777 /var/tmp

etc/X11/xorg.conf.d/20-modesetting.conf

@@ -3,5 +3,5 @@ Section "Device"
     Driver        "modesetting"
     Option        "ShadowFB" "false" # you don't need on recent hardware
     Option        "Atomic" "true" #only effective on Xlibre, or Xorg-git with a special patch
-    Option        "TearFree" "false"
+    Option        "TearFree" "false" # Compositor is being used so TearFree is not needed
 EndSection