From b91ab5d60314f269b470c87ecf463fb4840be852 Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Wed, 23 Apr 2025 13:27:11 +0200 Subject: [PATCH] Add version file for crane push --- .gitea/workflows/build-container.yml | 15 ++++++++++----- flake.nix | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-container.yml b/.gitea/workflows/build-container.yml index 9e75b00..3f3c3fd 100644 --- a/.gitea/workflows/build-container.yml +++ b/.gitea/workflows/build-container.yml @@ -1,7 +1,7 @@ -name: Build container +name: Build image on: [push] jobs: - build-container: + build-image: runs-on: ubuntu-22.04 steps: - name: Checkout repo @@ -12,12 +12,17 @@ jobs: uses: cachix/install-nix-action@v31 with: enable_kvm: false - - name: Build container - run: nix build .#docker + - name: Build image + run: nix build .#image - run: ls -l - run: ls -l $(readlink -f result) - 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 + - name: Get image name + run: nix build .#image-name -o image-name + + - run: echo $(cat image-name) + + - run: crane push result $(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 {