bug fixes in build bash scripts

Signed-off-by: SRIKUMAR VENUGOPAL <srikumarv@ie.ibm.com>
datashim-io · Jan 21, 2024 · a04271c · a04271c
1 parent d0826f2
commit a04271c
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 28 deletions.
diff --git a/build-tools/build_components.sh b/build-tools/build_components.sh
@@ -37,9 +37,9 @@ if [ $BUILD_AND_PUSH = "yes" ]; then
       if [ $CREATE_NEW_BUILDX_CONTEXT = "yes" ]; then
             docker buildx create --use
       fi
-      (cd ../src/dataset-operator && ./build_and_push_multiarch_dataset_operator.sh $REGISTRY_URL)
-      (cd ../src/generate-keys && ./build_and_push_multiarch_generate_keys.sh $REGISTRY_URL)
+      (cd ../src/dataset-operator && ./build_multiarch_dataset_operator.sh -p $REGISTRY_URL)
+      (cd ../src/generate-keys && ./build_multiarch_generate_keys.sh -p $REGISTRY_URL)
 else
-      (cd ../src/dataset-operator && ./build_and_push_multiarch_dataset_operator.sh $REGISTRY_URL --nopush)
-      (cd ../src/generate-keys && ./build_and_push_multiarch_generate_keys.sh $REGISTRY_URL --nopush)
+      (cd ../src/dataset-operator && ./build_multiarch_dataset_operator.sh $REGISTRY_URL)
+      (cd ../src/generate-keys && ./build_multiarch_generate_keys.sh $  REGISTRY_URL)
 fi
diff --git a/...ld_and_push_multiarch_dataset_operator.sh → ...rator/build_multiarch_dataset_operator.sh b/...ld_and_push_multiarch_dataset_operator.sh → ...rator/build_multiarch_dataset_operator.sh
@@ -1,5 +1,31 @@
 #!/bin/bash
 
+print_usage() {
+    echo "usage: $0 [-p] <REGISTRY_URL> <VERSION>"
+    echo "Use -p to build and push multiarch images"
+}
+
+PUSH="false"
+while getopts 'p' flag; do
+case "$flag" in
+    p) 
+        PUSH="true"
+        ;;
+    ?) 
+        print_usage >&2
+        exit 1
+        ;;
+esac
+done
+
+shift $((OPTIND-1))
+
+REGISTRY_URL="${1:-quay.io/datashim-io}"
+VERSION="${2:-latest}"
+
+echo $REGISTRY_URL
+echo $VERSION
+
 docker_build () {
     docker buildx build --platform linux/amd64,linux/arm64,linux/ppc64le -t ${REGISTRY_URL}/dataset-operator:${VERSION} .
 }
@@ -40,18 +66,6 @@ else
     fi
 fi 
 
-REGISTRY_URL="${1:-quay.io/datashim-io}"
-VERSION="${2:-latest}"
-
-PUSH="true"
-for arg in "$@"; do
-    if [ $arg == "--nopush" ]
-    then
-        echo "the images should not be pushed to the registry"
-        PUSH="false"
-    fi
-done
-
 if [ $PUSH == "true" ]
 then
     echo "pushing images to the registry"

diff --git a/...build_and_push_multiarch_generate_keys.sh → ...ate-keys/build_multiarch_generate_keys.sh b/...build_and_push_multiarch_generate_keys.sh → ...ate-keys/build_multiarch_generate_keys.sh
@@ -1,4 +1,31 @@
 #!/bin/bash
+set -e 
+
+print_usage() {
+    echo "usage: $0 [-p] <REGISTRY_URL> <VERSION>"
+    echo "Use -p to build and push multiarch images"
+}
+
+PUSH="false"
+while getopts 'p' flag; do
+case "$flag" in
+    p) 
+        PUSH="true"
+        ;;
+    ?) 
+        print_usage >&2
+        exit 1
+        ;;
+esac
+done
+
+shift $((OPTIND-1))
+
+REGISTRY_URL="${1:-quay.io/datashim-io}"
+VERSION="${2:-latest}"
+
+echo $REGISTRY_URL
+echo $VERSION
 
 docker_build () {
     docker buildx build --platform linux/amd64,linux/arm64 -t ${REGISTRY_URL}/generate-keys:${VERSION} .
@@ -40,18 +67,6 @@ else
     fi
 fi 
 
-REGISTRY_URL="${1:-quay.io/datashim-io}"
-VERSION="${2:-latest}"
-
-PUSH="true"
-for arg in "$@"; do
-    if [ $arg == "--nopush" ]
-    then
-        echo "the images should not be pushed to the registry"
-        PUSH="false"
-    fi
-done
-
 if [ $PUSH == "true" ]
 then
     echo "pushing images to the registry"