update for 3.0.1

Dockerfile

@@ -48,7 +48,7 @@ ARG CRYOSPARC_VERSION
 ENV CRYOSPARC_VERSION=${CRYOSPARC_VERSION}
 
 # install master
-ENV CRYOSPARC_MASTER_DIR ${CRYOSPARC_ROOT_DIR}/cryosparc2_master
+ENV CRYOSPARC_MASTER_DIR ${CRYOSPARC_ROOT_DIR}/cryosparc_master
 RUN --mount=type=secret,id=cryosparc_license_id \
   curl -L https://get.cryosparc.com/download/master-v${CRYOSPARC_VERSION}/$(cat /run/secrets/cryosparc_license_id) | tar -xz \
 	&& cd ${CRYOSPARC_MASTER_DIR} \
@@ -59,7 +59,7 @@ RUN --mount=type=secret,id=cryosparc_license_id \
 RUN sed -i 's:    disk_has_space=.*:    disk_has_space="true":g'  ${CRYOSPARC_MASTER_DIR}/bin/cryosparcm
 
 # install worker
-ENV CRYOSPARC_WORKER_DIR ${CRYOSPARC_ROOT_DIR}/cryosparc2_worker
+ENV CRYOSPARC_WORKER_DIR ${CRYOSPARC_ROOT_DIR}/cryosparc_worker
 RUN --mount=type=secret,id=cryosparc_license_id \
   curl -L https://get.cryosparc.com/download/worker-v${CRYOSPARC_VERSION}/$(cat /run/secrets/cryosparc_license_id) | tar -xz \
   && cd ${CRYOSPARC_WORKER_DIR} \

Makefile

 #CRYOSPARC_VERSION=2.12.4
 #CRYOSPARC_VERSION=2.14.2
-CRYOSPARC_VERSION=2.15.0
-TAG=${CRYOSPARC_VERSION}-8
+#CRYOSPARC_VERSION=2.15.0
+#TAG=${CRYOSPARC_VERSION}-8
+CRYOSPARC_VERSION=3.0.1
+TAG=${CRYOSPARC_VERSION}-0
 
 docker:
 	sudo DOCKER_BUILDKIT=1 docker build \
@@ -22,4 +24,5 @@ desktop:
 	sudo docker push slaclab/cryosparc-desktop:${TAG}
 
 desktop-singularity:
-	singularity pull -F /sdf/group/cryoem/sw/images/cryosparc/${CRYOSPARC_VERSION}-desktop/cryosparc-desktop_${CRYOSPARC_VERSION}.sif2 docker://slaclab/cryosparc-desktop:${TAG}
+	mkdir -p /sdf/group/cryoem/sw/images/cryosparc/${CRYOSPARC_VERSION}-desktop/
+	singularity pull -F /sdf/group/cryoem/sw/images/cryosparc/${CRYOSPARC_VERSION}-desktop/cryosparc-desktop_${CRYOSPARC_VERSION}.sif docker://slaclab/cryosparc-desktop:${TAG}