From c98044dbbc06238dcffe5992bc9a89a56fe6027b Mon Sep 17 00:00:00 2001
From: Paul Brinkmeier <paul.brinkmeier@almato.com>
Date: Wed, 23 Apr 2025 13:27:11 +0200
Subject: [PATCH] Add version file for crane push

---
 .gitea/workflows/build-container.yml | 25 ++++++++++++++++++-------
 flake.nix                            |  5 ++++-
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/build-container.yml b/.gitea/workflows/build-container.yml
index 9e75b00..4041ff4 100644
--- a/.gitea/workflows/build-container.yml
+++ b/.gitea/workflows/build-container.yml
@@ -1,23 +1,34 @@
-name: Build container
+name: Build image
 on: [push]
 jobs:
-  build-container:
+  build-image:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
       - run: ls -l
-      - run: apt update && apt install sudo
+      - run: apt-get update && apt-get install -y sudo
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
           enable_kvm: false
-      - name: Build container
-        run: nix build .#docker
+      - name: Build image
+        run: nix build .#image -o image.tar.gz
+      - name: Get image name
+        run: nix build .#image-name -o image-name
       - run: ls -l
-      - run: ls -l $(readlink -f result)
+      - run: ls -l $(readlink -f image.tar.gz)
       - name: Install crane
         run: |
           curl -sL "https://github.com/google/go-containerregistry/releases/download/v0.20.3/go-containerregistry_Linux_x86_64.tar.gz" > go-containerregistry.tar.gz
           tar -zxvf go-containerregistry.tar.gz -C /usr/local/bin/ crane
-      - run: crane push result
+
+      - run: echo $(cat image-name)
+
+      - run: tar tvf image.tar.gz
+      - run: echo $(readlink -f image.tar.gz)
+      - uses: actions/upload-artifact@v3
+        with:
+            name: tarball
+            path: image.tar.gz
+      - run: crane push $(readlink -f image.tar.gz) $(cat image-name)
diff --git a/flake.nix b/flake.nix
index 912a63f..178dcca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,7 +39,10 @@
     };
     packages.${system} = {
       default = vrnp-static;
-      docker = pkgs.dockerTools.buildImage {
+      image-name = pkgs.runCommand "vrnp-version" {} ''
+        echo -n git.pbrinkmeier.de/paul/vrnp:${vrnp-static.version} > $out
+      '';
+      image = pkgs.dockerTools.buildImage {
         name = "git.pbrinkmeier.de/paul/vrnp";
         tag = vrnp-static.version;
         copyToRoot = pkgs.buildEnv {