Skip to content

Commit 3a567c0

Browse files
committed
adjustments to runGRIDContainerized
1 parent 07ed1d3 commit 3a567c0

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

GRID/utils/runGRIDContainerized.sh

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,8 @@ else
1515
echo "Invalid architecture ${ARCH} detected. Exiting"
1616
exit 1
1717
fi
18-
if [ "$ARCH" == "aarch64" ]; then
19-
ISAARCH64="1"
20-
fi
2118
# we just use the default singularity container (if not already set)
22-
APPTAINER_CONTAINER=${APPTAINER_CONTAINER:-/cvmfs/alice.cern.ch/containers/fs/singularity/default${ISAARCH64+"-aarch64"}}
19+
APPTAINER_CONTAINER=${APPTAINER_CONTAINER:-/cvmfs/alice.cern.ch/containers/fs/apptainer/compat_el9-${ARCH}}
2320

2421
# create workdir if not specified externally
2522
if [ ! "${WORK_DIR}" ]; then
@@ -49,5 +46,6 @@ echo "JALIEN_TOKEN_CERT=/workdir/usercert.pem" > ${WORK_DIR}/envfile
4946
echo "JALIEN_TOKEN_KEY=/workdir/userkey.pem" >> ${WORK_DIR}/envfile
5047

5148
# launch job = script inside the container in the workdir
52-
/cvmfs/alice.cern.ch/containers/bin/apptainer/current${ISAARCH64+"-aarch64"}/bin/apptainer exec -C -B /cvmfs:/cvmfs,${WORK_DIR}:/workdir \
53-
--pwd /workdir --env-file ${WORK_DIR}/envfile ${APPTAINER_CONTAINER} /workdir/job.sh
49+
APPTAINER_EXEC="/cvmfs/alice.cern.ch/containers/bin/apptainer/${ARCH}/current/bin/apptainer"
50+
${APPTAINER_EXEC} exec -C -B /cvmfs:/cvmfs,${WORK_DIR}:/workdir \
51+
--pwd /workdir --env-file ${WORK_DIR}/envfile ${APPTAINER_CONTAINER} /workdir/job.sh

0 commit comments

Comments
 (0)