From eceec32264f8e6c92372709c641b2cf43d742cbd Mon Sep 17 00:00:00 2001 From: Paul Brinkmeier Date: Wed, 23 Apr 2025 17:01:00 +0200 Subject: [PATCH] Add version to image meta --- .gitea/workflows/build-container.yml | 11 +++++++---- flake.nix | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build-container.yml b/.gitea/workflows/build-container.yml index b1acf26..a22de14 100644 --- a/.gitea/workflows/build-container.yml +++ b/.gitea/workflows/build-container.yml @@ -15,13 +15,16 @@ jobs: uses: cachix/install-nix-action@v31 with: enable_kvm: false - - run: echo $GITHUB_REF_NAME + - name: Get image name + run: nix build .#image-meta -o image-meta + - name: Version check + run: | + VERSION=$(cat image-meta/version) + test "$GITHUB_REF_NAME" == v"$VERSION" - name: Build image run: nix build .#image -o image.tar.gz - - name: Get image name - run: nix build .#image-name -o image-name - run: docker login -u paul -p "$PASSWORD" git.pbrinkmeier.de env: PASSWORD: "${{ secrets.REGISTRY_PASSWORD }}" - run: docker load < image.tar.gz - - run: docker image push $(cat image-name) + - run: docker image push $(cat image-meta/name) diff --git a/flake.nix b/flake.nix index 178dcca..7f132a2 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,10 @@ }; packages.${system} = { default = vrnp-static; - image-name = pkgs.runCommand "vrnp-version" {} '' - echo -n git.pbrinkmeier.de/paul/vrnp:${vrnp-static.version} > $out + image-meta = pkgs.runCommand "vrnp-version" {} '' + mkdir -p $out + echo -n ${vrnp-static.version} > $out/version + echo -n git.pbrinkmeier.de/paul/vrnp:${vrnp-static.version} > $out/name ''; image = pkgs.dockerTools.buildImage { name = "git.pbrinkmeier.de/paul/vrnp";