From 4f218ab69872fa5bdd41ed9fcfb02269ad651878 Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Aug 23 2018 18:04:21 +0000
Subject: Fixes for container release script and manifest script


Signed-off-by: Mohan Boddu <mboddu@bhujji.com>

---

diff --git a/scripts/generate-manifest-list.py b/scripts/generate-manifest-list.py
index 3f14e12..98aae0b 100644
--- a/scripts/generate-manifest-list.py
+++ b/scripts/generate-manifest-list.py
@@ -89,7 +89,7 @@ if __name__ == "__main__":
         default="registry.fedoraproject.org",
     )
     parser.add_argument(
-        "--tag", help="tag to apply to the container image", default="latest"
+        "--tag", help="tag to apply to the container image"
     )
     parser.add_argument("--image", help="name of the container image", default="fedora")
     args = parser.parse_args()
@@ -108,9 +108,14 @@ if __name__ == "__main__":
         else:
             print(f"ERROR : Could not find the image manifest for fedora:{tag}")
 
+    if args.tag:
+        tags = [args.release, args.tag]
+    else:
+        tags = [args.release]
+
     push_manifest_list(
         manifest_list=MANIFEST_LIST,
-        tags=[args.release, args.tag],
+        tags=tags,
         name=args.image,
         registry=args.registry,
     )
diff --git a/scripts/sync-latest-container-base-image.sh b/scripts/sync-latest-container-base-image.sh
index 3482ef3..0744fed 100755
--- a/scripts/sync-latest-container-base-image.sh
+++ b/scripts/sync-latest-container-base-image.sh
@@ -92,7 +92,14 @@ if [[ -z "$stage" ]]; then
         for registry in "registry.fedoraproject.org" "candidate-registry.fedoraproject.org"
         do
             printf "Push manifest to ${registry}\n"
-            python3 generate-manifest-list.py -r ${1} --registry ${registry} --tag ${tagname} --image fedora
+            if [ -z "$tag" ]
+            then
+                printf "tag is not set: ${tag}\n"
+                python3 generate-manifest-list.py -r ${1} --registry ${registry} --image fedora
+            else
+                printf "tag is set: ${tag}\n"
+                python3 generate-manifest-list.py -r ${1} --registry ${registry} --tag ${tagname} --image fedora
+            fi
         done
         printf "Removing temporary directory\n"
         rm -rf $work_dir
@@ -115,7 +122,14 @@ if [[ -z "$stage" ]]; then
         for registry in "registry.fedoraproject.org" "candidate-registry.fedoraproject.org"
         do
             printf "Push manifest to ${registry}\n"
-            python3 generate-manifest-list.py -r ${1} --registry ${registry} --tag ${tagname} --image fedora-minimal
+            if [ -z "$tag" ]
+            then
+                printf "tag is not set: ${tag}\n"
+                python3 generate-manifest-list.py -r ${1} --registry ${registry} --image fedora-minimal
+            else
+                printf "tag is set: ${tag}\n"
+                python3 generate-manifest-list.py -r ${1} --registry ${registry} --tag ${tagname} --image fedora-minimal
+            fi
         done
 
         printf "Removing temporary directory\n"