Move the chained commands to a bash script

Author: ZQyou

docker-images/cryosparc/Dockerfile-patch

@@ -1,5 +1,5 @@
-ARG IMAGE_TAG
-FROM docker-registry.osc.edu/webservices/cryosparc:${IMAGE_TAG}
+ARG UNPATCHED_IMAGE
+FROM ${UNPATCHED_IMAGE}
 LABEL maintainer='Zhi-Qiang You <zyou@osc.edu>'
 
 COPY cryosparc_master_patch.tar.gz /tmp/patch.tar.gz

docker-images/cryosparc/Makefile

@@ -4,12 +4,12 @@ VERSION = 4.7.1
 REVISION = 3
 PATCH = 251124
 IMAGE = docker-registry.osc.edu/webservices/cryosparc
-_TAG = $(IMAGE):$(VERSION)-r$(REVISION)
 
 ifeq ($(PATCH),)
     FULL_VERSION = $(VERSION)-r$(REVISION)
 else
     FULL_VERSION = $(VERSION)p$(PATCH)-r$(REVISION)
+    UNPATCHED_IMAGE = $(IMAGE):$(VERSION)-r$(REVISION)
 endif
 TAG = $(IMAGE):$(FULL_VERSION)
 
@@ -21,30 +21,19 @@ ifeq ($(PATCH),)
 	-t $(TAG) $(ROOT_DIR)
 else
 	rm -rf $(ROOT_DIR)/tmp && mkdir -p $(ROOT_DIR)/tmp
+	cp cryosparc-patch.sh $(ROOT_DIR)/tmp/
 
 	docker run --rm \
 	-e CRYOSPARC_LICENSE_ID="$(LICENSE_ID)" \
 	-e CRYOSPARC_DB_PATH="/tmp/database" \
 	-e CRYOSPARC_BASE_PORT="31000" \
+	-e PATCH="$(PATCH)" \
 	-v $(ROOT_DIR)/tmp:/tmp \
-	$(_TAG) bash -c " \
-  		mkdir -p \$$CRYOSPARC_DB_PATH; \
-		rm -f run; \
-		cryosparcm start; \
-		cryosparcm status; \
-		cryosparcm patch --check; \
-		cryosparcm patch --download; \
-		tar xf cryosparc_master_patch.tar.gz -C /tmp/ cryosparc_master/patch; \
-		patch_num=\`cat /tmp/cryosparc_master/patch\`; \
-		echo Patch version found: \$$patch_num; \
-		if [ \"\$$patch_num\" != \"$(PATCH)\" ]; then \
-			echo Patch version mismatch: \$$patch_num != $(PATCH); \
-			exit 1; \
-		fi; \
-		cp -f cryosparc_master_patch.tar.gz /tmp/"
+	$(UNPATCHED_IMAGE) \
+       	bash /tmp/cryosparc-patch.sh
 
 	docker build \
-	--build-arg IMAGE_TAG="$(VERSION)-r$(REVISION)" \
+	--build-arg UNPATCHED_IMAGE="$(UNPATCHED_IMAGE)" \
 	-f $(ROOT_DIR)/Dockerfile-patch \
 	-t $(TAG) $(ROOT_DIR)/tmp
 endif

docker-images/cryosparc/cryosparc-patch.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -eE
+
+mkdir -p $CRYOSPARC_DB_PATH 
+rm -f run 
+
+cryosparcm start 
+cryosparcm status || true
+cryosparcm patch --check 
+cryosparcm patch --download 
+
+tar xf cryosparc_master_patch.tar.gz -C /tmp/ cryosparc_master/patch 
+patch_num=$(cat /tmp/cryosparc_master/patch)
+echo Patch version found: $patch_num 
+
+if [ "$patch_num" != "$PATCH" ]; then 
+    echo "Patch version mismatch: $patch_num != $PATCH"
+    exit 1
+fi
+
+cp -f cryosparc_master_patch.tar.gz /tmp/