updates with tested images final

platform9 · Dec 16, 2024 · 497e746 · 497e746
1 parent 7b4be77
commit 497e746
Showing 1 changed file with 111 additions and 116 deletions.
diff --git a/emp/custom-registry/emp_image_helper.sh b/emp/custom-registry/emp_image_helper.sh
@@ -17,117 +17,110 @@ set -eu
 
 IMAGES=""
 #Upstream Images
-IMAGES="$IMAGES public.ecr.aws/platform9/calico/apiserver:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/kube-controllers:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/node:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/pod2daemon-flexvol:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/cni:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/typha:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/pause:3.6"
-# IMAGES="$IMAGES public.ecr.aws/platform9/tigera/operator:master"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/apiserver:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/kube-controllers:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/node:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/pod2daemon-flexvol:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/cni:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/calico/typha:v3.28.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-importer:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-cloner:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-uploadserver:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-apiserver:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-controller:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-operator:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-uploadproxy:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-controller:v1.15.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-cainjector:v1.15.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-webhook:v1.15.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/provider-aws/cloud-controller-manager:v1.27.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/coredns/coredns:v1.11.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kas-network-proxy/proxy-agent:v0.0.32"
-# IMAGES="$IMAGES public.ecr.aws/platform9/metrics-server/metrics-server:v0.6.3"
-# IMAGES="$IMAGES public.ecr.aws/platform9/autoscaling/addon-resizer:1.8.14"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kube-proxy:v1.26.6"
-# IMAGES="$IMAGES public.ecr.aws/platform9/envoyproxy/envoy:v1.26.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/platform9/virtvnc:v1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/platform9/multus:v3.7.2-pmk-2644970"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubebuilder/kube-rbac-proxy:v0.11.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/platform9/luigi-plugins:v0.5.5"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-attacher:v4.5.0-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v4.0.0-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-resizer:v1.10.0-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/ebs-csi-driver/aws-ebs-csi-driver:v1.29.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/livenessprobe:v2.12.0-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.10.0-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/amazon/aws-efs-csi-driver:v1.5.5"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/livenessprobe:v2.9.0-eks-1-27-latest"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kube-state-metrics/kube-state-metrics:v2.12.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/prometheus/node-exporter:v1.8.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/prometheus/prometheus:v2.52.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/prometheus-operator/prometheus-config-reloader:v0.73.2"
-# IMAGES="$IMAGES public.ecr.aws/platform9/grafana/promtail:2.9.3"
-# IMAGES="$IMAGES public.ecr.aws/platform9/tigera/operator:v1.34.0"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v3.4.0-eks-1-27-latest"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.7.0-eks-1-27-latest"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-controller:v1.14.4"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-webhook:v1.14.4"
-# IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-cainjector:v1.14.4"
-# IMAGES="$IMAGES public.ecr.aws/platform9/pause:3.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-apiserver:v1.59.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v3.4.0-eks-1-27-latest"
-# IMAGES="$IMAGES public.ecr.aws/platform9/sig-storage/snapshot-controller:v8.0.1"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.7.0-eks-1-27-latest"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v7.0.1-eks-1-29-7"
-# IMAGES="$IMAGES public.ecr.aws/platform9/aws-ebs-csi-driver:0.2.0"
-
-# #Builder changes
-# #Kubevirt images
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-exportproxy:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/fedora-with-test-tooling-container-disk:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/disks-images-provider:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/network-slirp-binding:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-controller:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-handler:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-exportserver:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/pr-helper:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/example-cloudinit-hook-sidecar:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/cirros-custom-container-disk-demo:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virtio-container-disk:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/alpine-ext-kernel-boot-demo:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/alpine-with-test-tooling-container-disk:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/libguestfs-tools:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/example-hook-sidecar:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/example-disk-mutation-hook-sidecar:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/alpine-container-disk-demo:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/cirros-container-disk-demo:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/vm-killer:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/winrmcli:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/sidecar-shim:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/network-passt-binding:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-operator:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-api:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/virt-launcher:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/conformance:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/fedora-realtime-container-disk:1.1.189"
-# IMAGES="$IMAGES public.ecr.aws/platform9/nfs-server:1.1.189"
-
-# IMAGES="$IMAGES public.ecr.aws/platform9/evm-stack-controller-manager:1.0.372"
-# IMAGES="$IMAGES public.ecr.aws/platform9/pmk-vpc-cni:1.1.152"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-pmk-init:1.1.185"
-# IMAGES="$IMAGES public.ecr.aws/platform9/eks-vol-watcher:1.0.372"
-# IMAGES="$IMAGES public.ecr.aws/platform9/cni-metrics-helper:1.1.152"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-webhook-eks:1.1.21"
-# IMAGES="$IMAGES public.ecr.aws/platform9/evm-vpc-cni:1.1.80"
-# IMAGES="$IMAGES public.ecr.aws/platform9/evm-autoscaler:1.1.125"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-pod-webhook:1.1.220"
-# IMAGES="$IMAGES public.ecr.aws/platform9/pmk-vpc-cni-init:1.1.152"
-# IMAGES="$IMAGES public.ecr.aws/platform9/evm-vpc-cni-init:1.1.80"
-
-# #Charts
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/eks-cluster-chart:1.1.704"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/baremetal-chart:1.1.814"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/cert-manager:1.14.4"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/promtail:6.15.5"
-# IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/promtail-temp:6.15.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/pause:3.6"
+IMAGES="$IMAGES public.ecr.aws/platform9/tigera/operator:v1.32.12"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/apiserver:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/kube-controllers:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/node:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/pod2daemon-flexvol:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/cni:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/calico/typha:v3.27.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-importer:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-cloner:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-uploadserver:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-apiserver:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-controller:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-operator:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-uploadproxy:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-controller:v1.15.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-cainjector:v1.15.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-webhook:v1.15.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/provider-aws/cloud-controller-manager:v1.27.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/coredns/coredns:v1.11.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kas-network-proxy/proxy-agent:v0.0.32"
+IMAGES="$IMAGES public.ecr.aws/platform9/metrics-server/metrics-server:v0.6.4"
+IMAGES="$IMAGES public.ecr.aws/platform9/autoscaling/addon-resizer:1.8.14"
+IMAGES="$IMAGES public.ecr.aws/platform9/kube-proxy:v1.26.6"
+IMAGES="$IMAGES public.ecr.aws/platform9/envoyproxy/envoy:v1.26.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/platform9/virtvnc:v1"
+IMAGES="$IMAGES public.ecr.aws/platform9/platform9/multus:v3.7.2-pmk-2644970"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubebuilder/kube-rbac-proxy:v0.11.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/platform9/luigi-plugins:v0.5.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-attacher:v4.5.0-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v4.0.0-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-resizer:v1.10.0-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/ebs-csi-driver/aws-ebs-csi-driver:v1.29.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/livenessprobe:v2.12.0-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.10.0-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/amazon/aws-efs-csi-driver:v1.5.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/livenessprobe:v2.9.0-eks-1-27-latest"
+IMAGES="$IMAGES public.ecr.aws/platform9/kube-state-metrics/kube-state-metrics:v2.12.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/prometheus/node-exporter:v1.8.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/prometheus/prometheus:v2.52.0"
+IMAGES="$IMAGES public.ecr.aws/platform9/prometheus-operator/prometheus-config-reloader:v0.73.2"
+IMAGES="$IMAGES public.ecr.aws/platform9/grafana/promtail:2.9.3"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v3.4.0-eks-1-27-latest"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.7.0-eks-1-27-latest"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-controller:v1.14.4"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-webhook:v1.14.4"
+IMAGES="$IMAGES public.ecr.aws/platform9/jetstack/cert-manager-cainjector:v1.14.4"
+IMAGES="$IMAGES public.ecr.aws/platform9/pause:3.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/kubevirt/cdi-apiserver:v1.59.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-provisioner:v3.4.0-eks-1-27-latest"
+IMAGES="$IMAGES public.ecr.aws/platform9/sig-storage/snapshot-controller:v8.0.1"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/node-driver-registrar:v2.7.0-eks-1-27-latest"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-distro/kubernetes-csi/external-snapshotter/csi-snapshotter:v7.0.1-eks-1-29-7"
+IMAGES="$IMAGES public.ecr.aws/platform9/aws-ebs-csi-driver:0.2.0"
+
+#Builder changes
+#Kubevirt images
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-exportproxy:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/fedora-with-test-tooling-container-disk:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/disks-images-provider:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/network-slirp-binding:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-controller:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-handler:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-exportserver:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/pr-helper:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/example-cloudinit-hook-sidecar:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/cirros-custom-container-disk-demo:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virtio-container-disk:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/alpine-ext-kernel-boot-demo:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/alpine-with-test-tooling-container-disk:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/libguestfs-tools:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/example-hook-sidecar:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/example-disk-mutation-hook-sidecar:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/alpine-container-disk-demo:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/cirros-container-disk-demo:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/vm-killer:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/winrmcli:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/sidecar-shim:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/network-passt-binding:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-operator:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-api:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/virt-launcher:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/conformance:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/fedora-realtime-container-disk:1.1.189"
+IMAGES="$IMAGES public.ecr.aws/platform9/nfs-server:1.1.189"
+
+IMAGES="$IMAGES public.ecr.aws/platform9/evm-stack-controller-manager:1.0.376"
+IMAGES="$IMAGES public.ecr.aws/platform9/pmk-vpc-cni:1.1.152"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-pmk-init:1.1.190"
+IMAGES="$IMAGES public.ecr.aws/platform9/eks-vol-watcher:1.0.376"
+IMAGES="$IMAGES public.ecr.aws/platform9/cni-metrics-helper:1.1.152"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-webhook-eks:1.1.21"
+IMAGES="$IMAGES public.ecr.aws/platform9/evm-vpc-cni:1.1.81"
+IMAGES="$IMAGES public.ecr.aws/platform9/evm-autoscaler:1.1.132"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-pod-webhook:1.1.223"
+IMAGES="$IMAGES public.ecr.aws/platform9/pmk-vpc-cni-init:1.1.152"
+IMAGES="$IMAGES public.ecr.aws/platform9/evm-vpc-cni-init:1.1.80"
+
+#Charts
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/eks-cluster-chart:1.1.704"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/baremetal-chart:1.1.850"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/cert-manager:1.14.4"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/promtail:6.15.5"
+IMAGES="$IMAGES public.ecr.aws/platform9/emp-helm-charts/promtail-temp:6.15.5"
 
 READ_REPO=""
 profile=""
@@ -171,16 +164,18 @@ spinner() {
     while kill -0 "$pid" 2>/dev/null; do
         temp="${spinstr#?}"
         spinstr=$temp${spinstr%"$temp"}
-        image=`cat $IMG_FILE`
-        printf "\r${Cb} ⋯ %s  ${Cy}Processing: %*s %s ${CR}" "${spinstr:0:1}" "$last_word_length" "$image" >&2
+        if [ -f "$IMG_FILE" ]; then
+            image=$(cat "$IMG_FILE")
+        fi
+        printf "\r\033[K${Cb} ⋯ %s  ${Cy}Processing: %s${CR}" "${spinstr:0:1}" "$image" >&2
         last_word_length=${#IMG_FILE}
         if (( last_word_length > max )); then
             max=$last_word_length
         fi
         sleep "$delay"
     done
     max=$(expr $max + 32)
-    printf "\r${Cgr}%s ✓ Completed %*s ${CR}\n" "$(date +'%F %T')" "$max" >&2
+    printf "\r\033[K${Cgr}%s ✓ Completed %*s${CR}\n" "$(date +'%F %T')" "$max" >&2
 }
 
 # debug - prints a DEBUG message (normally gray on black)
@@ -409,7 +404,7 @@ push_images_registry() {
 		        aws_create_repo "$3" "$4" "$1" "$2"
 	        else
 		        debug "here in jfrog"
-		        debug "tagging:$tg"
+		        #debug "tagging:$tg"
 	        fi
             sleep 3
             if [[ -z "$2" ]]; then
@@ -427,7 +422,7 @@ push_images_registry() {
                 debug "$tg"
                 $CNT_CMD tag "$img" "$tg"
                 $CNT_CMD push "$tg"
-                #$CNT_CMD rmi "$tg"
+                $CNT_CMD rmi "$tg"
                 debug "Pushed $tg into $reg"
             fi
         done