Fixed merge issues

.github/workflows/build.yml

@@ -5,6 +5,9 @@ on:
       - main
   schedule:
     - cron: '20 20 * * *'  # 8:20pm everyday
+  push:
+    branches:
+      - main
 env:
     IMAGE_NAME: base
     IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }}
@@ -24,7 +27,7 @@ jobs:
     steps: 
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Generate tags
         id: generate-tags

Containerfile

@@ -12,5 +12,5 @@ RUN rpm-ostree override remove firefox firefox-langpacks && \
     sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
     systemctl enable rpm-ostreed-automatic.timer && \
     systemctl enable flatpak-automatic.timer && \
-    rpm-ostree cleanup -m && \
+
     ostree container commit