From 8691ee354cab24d29fb8c115cbcda28663f4491c Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 17 Aug 2023 13:38:15 -0500
Subject: [PATCH] fix drone build

---
 .drone.yml |  8 ++++----
 flake.nix  | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 33da903..ec9c78f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,8 +20,8 @@ steps:
     pull: always
     commands:
       - set
-      - echo "$${PLUGIN_USERNAME}" "$${USERNAME}"
-      - echo -n "$${PLUGIN_PASSWORD}" | podman login --username $${PLUGIN_USERNAME} --password-stdin $${PLUGIN_REGISTRY}
+      - nix run .#login
+      # - echo -n "$${PLUGIN_PASSWORD}" | podman login --username $${PLUGIN_USERNAME} --password-stdin $${PLUGIN_REGISTRY}
       - nix build .#nixos-runner
       # - nix run .#push-container -- result
       - podman load --input result | sed -n -e "s/Loaded image:.\\(.*\\)/\\1/p" > loaded-image
@@ -30,8 +30,8 @@ steps:
       - podman tag "$$(<loaded-image)" "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:$${DRONE_BUILD_NUMBER}-$${DRONE_COMMIT_SHA:0:8}"
       - podman tag "$$(<loaded-image)" "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:latest"
       - podman images
-      - podman push "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:8}"
-      - podman push "$${PLUGIN_REGISTRY}/${PLUGIN_REPOSITORY}:latest"
+      - podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:${DRONE_BUILD_NUMBER}-${DRONE_COMMIT_SHA:0:8}"
+      - podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:latest"
       - podman logout "$${PLUGIN_REGISTRY}"
     env:
       REGISTRY: docker.io
diff --git a/flake.nix b/flake.nix
index 2bf3de3..9468371 100644
--- a/flake.nix
+++ b/flake.nix
@@ -389,6 +389,16 @@
               type = "app";
               program = "${self.packages.${system}.push-container}/bin/push-container";
             };
+            login =
+              let
+                program = pkgs.writeScript "program" ''
+                  echo -n "''${PLUGIN_PASSWORD}" | ${pkgs.podman}/bin/podman login --username "''${PLUGIN_USERNAME}" --password-stdin "''${PLUGIN_REGISTRY}"
+                '';
+              in
+              {
+                type = "app";
+                program = "${program}";
+              };
           };
         }
       )