github_image_helper for podman idaholab#407

mmguero-dev · Sep 11, 2024 · eddac68 · eddac68
1 parent 22de09f
commit eddac68
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/scripts/github_image_helper.sh b/scripts/github_image_helper.sh
@@ -16,6 +16,7 @@ if ! (type "$REALPATH" && type "$DIRNAME" && type "$GREP" && type git) > /dev/nu
 fi
 SCRIPT_PATH="$($DIRNAME $($REALPATH -e "${BASH_SOURCE[0]}"))"
 IMAGE_ARCH_SUFFIX="$(uname -m | sed 's/^x86_64$//' | sed 's/^arm64$/-arm64/' | sed 's/^aarch64$/-arm64/')"
+MALCOLM_CONTAINER_RUNTIME="${MALCOLM_CONTAINER_RUNTIME:-docker}"
 
 set -uo pipefail
 shopt -s nocasematch
@@ -106,8 +107,8 @@ function _PullAndTagGithubWorkflowBuild() {
   OWNER="$(_gitowner)"
   IMAGE=$1
 
-  docker pull $QUIET_PULL_FLAG ghcr.io/"$OWNER"/"$IMAGE":"${BRANCH}${IMAGE_ARCH_SUFFIX}" && \
-    docker tag ghcr.io/"$OWNER"/"$IMAGE":"${BRANCH}${IMAGE_ARCH_SUFFIX}" ghcr.io/idaholab/"$IMAGE":"${VERSION}${IMAGE_ARCH_SUFFIX}"
+  $MALCOLM_CONTAINER_RUNTIME pull $QUIET_PULL_FLAG ghcr.io/"$OWNER"/"$IMAGE":"${BRANCH}${IMAGE_ARCH_SUFFIX}" && \
+    $MALCOLM_CONTAINER_RUNTIME tag ghcr.io/"$OWNER"/"$IMAGE":"${BRANCH}${IMAGE_ARCH_SUFFIX}" ghcr.io/idaholab/"$IMAGE":"${VERSION}${IMAGE_ARCH_SUFFIX}"
 }
 
 function PullAndTagGithubWorkflowImages() {
@@ -145,12 +146,12 @@ function _ExtractISOFromGithubWorkflowBuild() {
   DEST_DIR="${2:-"$(pwd)"}"
   ISO_NAME="${3:-"$TOOL-$VERSION"}"
 
-  docker run --rm -d --name "$TOOL"-iso-srv -p 127.0.0.1:8000:8000/tcp -e QEMU_START=false -e NOVNC_START=false \
+  $MALCOLM_CONTAINER_RUNTIME run --rm -d --name "$TOOL"-iso-srv -p 127.0.0.1:8000:8000/tcp -e QEMU_START=false -e NOVNC_START=false \
       ghcr.io/"$OWNER"/malcolm/"$TOOL":"$BRANCH" && \
     sleep 10 && \
     curl -sSL -o "$DEST_DIR"/"$ISO_NAME".iso http://localhost:8000/live.iso && \
     curl -sSL -o "$DEST_DIR"/"$ISO_NAME"-build.log http://localhost:8000/"$TOOL"-"$VERSION"-build.log
-  docker stop "$TOOL"-iso-srv
+  $MALCOLM_CONTAINER_RUNTIME stop "$TOOL"-iso-srv
 }
 
 function ExtractISOsFromGithubWorkflowBuilds() {
@@ -173,7 +174,7 @@ function ExtractAndLoadImagesFromGithubWorkflowBuildISO() {
       if [[ -e filesystem.squashfs ]]; then
         unsquashfs filesystem.squashfs -f malcolm_images.tar.xz
         if [[ -e squashfs-root/malcolm_images.tar.xz ]]; then
-          docker load -i squashfs-root/malcolm_images.tar.xz
+          $MALCOLM_CONTAINER_RUNTIME load -i squashfs-root/malcolm_images.tar.xz
         else
           echo "Failed to images tarball" 2>&1
         fi