From 6690b5c1ea64cfb9f29e0a8b689ed571495f1be9 Mon Sep 17 00:00:00 2001
From: Joakim Repomaa <joakim.repomaa@mocoapp.com>
Date: Fri, 20 Feb 2026 21:50:30 +0200
Subject: [PATCH] try fixing docker-image build

---
 .gitea/workflows/build-images.yml | 39 ++++++++++++++++++++++++++++---
 flake.nix                         |  3 ++-
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/build-images.yml b/.gitea/workflows/build-images.yml
index 7ed25fd..0d5f042 100644
--- a/.gitea/workflows/build-images.yml
+++ b/.gitea/workflows/build-images.yml
@@ -7,12 +7,45 @@ on:
     branches: [main]
 
 jobs:
-  check:
+  build:
     runs-on: nixos-latest
 
     steps:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Build Image
-        run: nix build .#dockerImages.aarch64-linux.node
+      - name: Install Skopeo
+        run: nix shell nixpkgs#skopeo -c echo "skopeo installed"
+
+      - name: Build x86_64 Image
+        run: nix build .#dockerImages.x86_64-linux.node --out-link ./image-x86_64.tar.gz
+
+      - name: Build aarch64 Image
+        run: nix build .#dockerImages.aarch64-linux.node --out-link ./image-aarch64.tar.gz
+
+      - name: Push to Gitea Registry
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+        env:
+          GITEA_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Push x86_64 image
+          skopeo copy \
+            --insecure-policy \
+            --dest-creds "${{ github.actor }}:${GITEA_TOKEN}" \
+            "docker-archive:./image-x86_64.tar.gz" \
+            "docker://${{ github.server_url }}/${{ github.repository }}/node:latest-amd64"
+          
+          # Push aarch64 image  
+          skopeo copy \
+            --insecure-policy \
+            --dest-creds "${{ github.actor }}:${GITEA_TOKEN}" \
+            "docker-archive:./image-aarch64.tar.gz" \
+            "docker://${{ github.server_url }}/${{ github.repository }}/node:latest-arm64"
+          
+          # Create and push manifest for multi-arch
+          skopeo manifest create \
+            --insecure-policy \
+            --dest-creds "${{ github.actor }}:${GITEA_TOKEN}" \
+            "docker://${{ github.server_url }}/${{ github.repository }}/node:latest" \
+            "docker://${{ github.server_url }}/${{ github.repository }}/node:latest-amd64" \
+            "docker://${{ github.server_url }}/${{ github.repository }}/node:latest-arm64"
diff --git a/flake.nix b/flake.nix
index 70bb029..750c4a6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -140,7 +140,7 @@
                       name = "node";
                       tag = "latest";
                       runAsRoot = ''
-                        #!${pkgs.stdenv.shell}
+                        #!${pkgs.runtimeShell}
                         set -e
                         ${pkgs.dockerTools.shadowSetup}
                         groupadd -r node
@@ -156,6 +156,7 @@
                           nix
                           busybox
                           bash
+                          skopeo
                         ];
                       };
                       config = {