From bef4a0aabfd8611d8fbed1b1f90380d6fc8e2443 Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Sun, 16 Apr 2023 01:14:30 -0500
Subject: [PATCH] cleanup and remove debug

---
 flake.nix         |  2 +-
 push-container.nu | 21 ++++++---------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/flake.nix b/flake.nix
index 003552f..cc836c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -156,8 +156,8 @@
                     "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
                   ];
                   experimental-features = [
-                    "nix-command"
                     "flakes"
+                    "nix-command"
                   ];
                 };
 
diff --git a/push-container.nu b/push-container.nu
index 8fbae93..aed0f75 100644
--- a/push-container.nu
+++ b/push-container.nu
@@ -7,8 +7,6 @@ def main [
     --no-drone-tag # Don't add tag calculated from DRONE_BUILD_NUMBER and DRONE_COMMIT_SHA
     --no-github-tag # Don't add tag calculated from GItHUB_RUN_NUMBER and GITHUB_SHA
 ] {
-    env
-
     if not ($input | path exists) {
         print $"($input) does not exist!"
         exit 1
@@ -50,8 +48,6 @@ def main [
         $tags
     }
 
-    print $tags
-
     let auth = {username: null, password: null}
 
     let auth = (
@@ -73,8 +69,6 @@ def main [
         }
     )
 
-    print $auth
-
     let registry = (
         if ($registry | is-empty) {
             if not ($env | get -i PLUGIN_REGISTRY | is-empty) {
@@ -101,25 +95,21 @@ def main [
         }
     )
 
-    alias podman = ^podman --log-level error --cgroup-manager=cgroupfs
+    alias podman = ^podman --log-level error
 
-    print "AAA"
     $auth.password | podman login --username $auth.username --password-stdin $registry
-    print "BBB"
-    let load_result = (do {podman load --input $input} | complete)
+
+    let load_result = (do { podman load --input $input } | complete)
     if $load_result.exit_code != 0 {
         print $load_result.stderr
         exit 1
     }
-    print "CCC"
+
     let old_image = ($load_result.stdout | str trim | parse "Loaded image: {image}" | get 0.image)
 
-    print $old_image
-    podman images
     $tags | each {
         |tag|
         let new_image = $"($registry)/($repository):($tag)"
-        print $new_image
         let tag_result = (do { podman tag $old_image $new_image } | complete)
         if $tag_result.exit_code != 0 {
             print $tag_result.stderr
@@ -130,7 +120,8 @@ def main [
             print $push_result.stderr
             exit 1
         }
+        print $"Pushed $(new_image)"
     }
-    podman images
+
     podman logout $registry
 }