From 302fd84fed8616d4b3259c3265c5b01554fe8d91 Mon Sep 17 00:00:00 2001
From: fj0r <82698591+fj0r@users.noreply.github.com>
Date: Fri, 26 Jan 2024 20:48:51 +0800
Subject: [PATCH] image-push supports renaming via -t (#750)

fix nu-complete of `docker registry show`

Co-authored-by: nash <nash@iffy.me>
---
 modules/docker/docker.nu | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/docker/docker.nu b/modules/docker/docker.nu
index 8894300c..98a9c311 100644
--- a/modules/docker/docker.nu
+++ b/modules/docker/docker.nu
@@ -257,9 +257,19 @@ export def image-tag [from: string@"nu-complete docker images"  to: string -n: s
 }
 
 # push image
-export def image-push [img: string@"nu-complete docker images" -n: string@"nu-complete docker ns" -i] {
+export def image-push [
+    img: string@"nu-complete docker images"
+    --tag(-t): string
+    -n: string@"nu-complete docker ns" -i
+] {
     let $insecure = if $i {[--insecure-registry]} else {[]}
-    ^$env.docker-cli ...($n | with-flag -n) ...$insecure push $img
+    if ($tag | is-empty) {
+        ^$env.docker-cli ...($n | with-flag -n) ...$insecure push $img
+    } else {
+        ^$env.docker-cli ...($n | with-flag -n) tag $img $tag
+        ^$env.docker-cli ...($n | with-flag -n) ...$insecure push $tag
+        ^$env.docker-cli ...($n | with-flag -n) rmi $tag
+    }
 }
 
 # pull image
@@ -395,9 +405,9 @@ def has [name] {
 def "nu-complete registry show" [cmd: string, offset: int] {
     let new = $cmd | str ends-with ' '
     let cmd = $cmd | split row ' '
-    let url = $cmd.2?
-    let reg = $cmd.3?
-    let tag = $cmd.4?
+    let url = $cmd.3?
+    let reg = $cmd.4?
+    let tag = $cmd.5?
     let auth = if ($env | has 'REGISTRY_TOKEN') {
         [-H $"Authorization: Basic ($env.REGISTRY_TOKEN)"]
     } else {