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

---
 .drone.yml |  6 +++---
 flake.nix  | 17 +++++++----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index ec9c78f..1b85803 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -19,9 +19,9 @@ steps:
     image: docker.io/jcollie/nixos-runner:latest
     pull: always
     commands:
-      - set
+      # - set
       - nix run .#login
-      # - echo -n "$${PLUGIN_PASSWORD}" | podman login --username $${PLUGIN_USERNAME} --password-stdin $${PLUGIN_REGISTRY}
+      - 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,7 +30,7 @@ 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}:$${DRONE_BUILD_NUMBER}-$${DRONE_COMMIT_SHA:0:8}"
       - podman push "$${PLUGIN_REGISTRY}/$${PLUGIN_REPOSITORY}:latest"
       - podman logout "$${PLUGIN_REGISTRY}"
     env:
diff --git a/flake.nix b/flake.nix
index 9468371..216c9f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -383,22 +383,19 @@
               ];
               executable = true;
             };
+            login-script = pkgs.writeScriptBin "login-script" ''
+              echo -n "''${PLUGIN_PASSWORD}" | ${pkgs.podman}/bin/podman login --username "''${PLUGIN_USERNAME}" --password-stdin "''${PLUGIN_REGISTRY}"
+            '';
           };
           apps = {
             push-container = {
               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}";
-              };
+            login = {
+              type = "app";
+              program = "${self.packages.${system}.login-script}/bin/login-script";
+            };
           };
         }
       )