fix: enhance docker.sh to simulate and release-images to work off of a file

Signed-off-by: Kevin O'Donnell <kevin@blockchaintp.com>

Author: scealiontach

bash/docker.sh

@@ -26,15 +26,19 @@ source "$(dirname "${BASH_SOURCE[0]}")/includer.sh"
 
 function docker::cmd() {
   @doc Smart command for docker.
-  $(commands::use docker) "$@"
+  if [ -z "$SIMULATE" ]; then
+    $(commands::use docker) "$@"
+  else
+    echo "$(commands::use docker)" "$@"
+  fi
 }
 
 function docker::pull() {
   @doc pull the specified image
   @arg _1_ the full image url to pull
   local image=${1:?}
   log::info "Pulling $image"
-  exec::hide docker::cmd pull -q "$image"
+  docker::cmd pull -q "$image"
 }
 
 function docker::tag() {
@@ -43,15 +47,15 @@ function docker::tag() {
   @arg _2_ the desired final url
   local from=${1:?}
   local to=${2:?}
-  exec::hide docker::cmd tag "$from" "$to"
+  docker::cmd tag "$from" "$to"
 }
 
 function docker::push() {
   @doc push the specified image
   @arg _1_ the full image url to push
   local image=${1:?}
   log::info "Pushing $image"
-  exec::hide docker::cmd push "$image"
+  docker::cmd push "$image"
 }
 
 function docker::cp() {
@@ -131,7 +135,6 @@ function docker::promote_latest() {
   local organization=${1:?}
   local registry=${2:?}
   local target_tag=${3:?}
-  local simulate=${SIMULATE:-""}
   shift 3
 
   for repo in $(docker::list_repositories "$registry" |
@@ -143,28 +146,14 @@ function docker::promote_latest() {
       log::warn "$repo has no official version in $target_tag"
       continue
     fi
-    if [ -z "$simulate" ]; then
-      docker::cp "$registry/$repo:$src_version" "$registry/$repo:$target_tag"
-    else
-      log::notice "Would copy $registry/$repo:$src_version to $registry/$repo:$target_tag"
-    fi
+    docker::cp "$registry/$repo:$src_version" "$registry/$repo:$target_tag"
     for extra_registry in "$@"; do
-      if [ -z "$simulate" ]; then
-        docker::tag "$registry/$repo:$src_version" "$extra_registry/$repo:$src_version"
-        docker::tag "$registry/$repo:$target_tag" "$extra_registry/$repo:$target_tag"
-      else
-        log::notice "Would tag $registry/$repo:$src_version as $extra_registry/$repo:$src_version"
-        log::notice "Would tag $registry/$repo:$target_tag as $extra_registry/$repo:$target_tag"
-      fi
+      docker::tag "$registry/$repo:$src_version" "$extra_registry/$repo:$src_version"
+      docker::tag "$registry/$repo:$target_tag" "$extra_registry/$repo:$target_tag"
     done
     for extra_registry in "$@"; do
-      if [ -z "$simulate" ]; then
-        docker::push "$extra_registry/$repo:$src_version"
-        docker::push "$extra_registry/$repo:$target_tag"
-      else
-        log::notice "Would push $extra_registry/$repo:$src_version"
-        log::notice "Would push $extra_registry/$repo:$target_tag"
-      fi
+      docker::push "$extra_registry/$repo:$src_version"
+      docker::push "$extra_registry/$repo:$target_tag"
     done
   done
 }

bash/release-images

@@ -17,6 +17,7 @@
 # shellcheck source=includer.sh
 source "$(dirname "${BASH_SOURCE[0]}")/includer.sh"
 
+@include options
 @include docker
 
 log::level 2
@@ -25,25 +26,37 @@ function usage() {
 }
 
 additional_registries=()
+function _add_additional_registry {
+  local registry=${1:?}
+  additional_registries+=("$registry")
+}
 
-while getopts ":s:t:r:x:a:" o; do
-  case "${o}" in
-    a)
-      additional_registries+=("${OPTARG}")
-      ;;
-    t)
-      target_tag=${OPTARG}
-      ;;
-    r)
-      target_registry=${OPTARG}
-      ;;
-    *)
-      usage
-      ;;
-  esac
-done
+options::standard
+options::description "various tools to do with releasing and publishing images"
+options::add -o t -d "Target tag pattern to copy" -a -m -e target_tag
+options::add -o r -d "Source registry to find images" -a -m -e target_registry
+options::add -o a -d "target registry url to copy to, may be repeated" -a -m -f _add_additional_registry
+options::add -o d -d "dry run execution" -x DRY_RUN
+options::add -o f -d "use images file" -a -e IMAGES_FILE
+options::parse "$@"
 shift $((OPTIND - 1))
 
-docker::promote_latest blockchaintp "$target_registry" \
-  "$target_tag" \
-  "${additional_registries[@]}"
+if [ "$DRY_RUN" = "true" ]; then
+  export SIMULATE=true
+fi
+
+if [ -z "$IMAGES_FILE" ]; then
+  for additional_registry in "${additional_registries[@]}"; do
+    docker::promote_latest blockchaintp "${target_registry:?}" \
+      "${target_tag:?}" \
+      "$additional_registry"
+  done
+else
+  while IFS= read -r repository; do
+    echo "Repository: $repository"
+    for additional_registry in "${additional_registries[@]}"; do
+      docker::cp "$target_registry/$repository:$target_tag" \
+        "$additional_registry/$repository:$target_tag"
+    done
+  done < <(grep -v '^ *#' <"$IMAGES_FILE")
+fi