From 559d9e0fbda47f9fdd554d6448397746824042ed Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 5 Oct 2024 12:40:10 -0400 Subject: [PATCH] refactor(docker): use rec for imageName in image files --- nixosModules/docker/.template/images/image.nix | 4 ++-- nixosModules/docker/updateImage.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixosModules/docker/.template/images/image.nix b/nixosModules/docker/.template/images/image.nix index 5a212259..152d9b12 100644 --- a/nixosModules/docker/.template/images/image.nix +++ b/nixosModules/docker/.template/images/image.nix @@ -1,8 +1,8 @@ pkgs: -pkgs.dockerTools.pullImage { +pkgs.dockerTools.pullImage rec { imageName = "some/image/name"; imageDigest = ""; sha256 = ""; - finalImageName = ""; + finalImageName = imageName; finalImageTag = "latest"; } diff --git a/nixosModules/docker/updateImage.nix b/nixosModules/docker/updateImage.nix index d0ba691c..cea02e50 100644 --- a/nixosModules/docker/updateImage.nix +++ b/nixosModules/docker/updateImage.nix @@ -25,7 +25,8 @@ writeShellApplication { if [[ "$CURRENT_DIGEST" != "$NEW_DIGEST" ]]; then echo -e "• $output:\n $CURRENT_DIGEST\n → $NEW_DIGEST\n" PREFETCH=$(nix-prefetch-docker "$IMAGE" "$TAG") - echo -e "pkgs:\npkgs.dockerTools.pullImage $PREFETCH" > "$FILE" + echo -e "pkgs:\npkgs.dockerTools.pullImage rec $PREFETCH" > "$FILE" + sed -i 's/finalImageName.*/finalImageName = imageName;/' "$FILE" fi fi '';