Run as biocbuild, consolidate startup scripts

Author: A Wokaty

Dockerfile

@@ -6,10 +6,12 @@ RUN useradd -ms /bin/bash biocbuild && apt update -qq && apt install sudo system
 USER biocbuild
 COPY . /home/biocbuild/bioconductor_salt
 WORKDIR /home/biocbuild
-RUN DEBIAN_FRONTEND="noninteractive" bash bioconductor_salt/startup_bbs_standalone_${CYCLE}.sh ${NAME}
+RUN DEBIAN_FRONTEND="noninteractive" bash bioconductor_salt/startup_bbs_standalone.sh ${CYCLE} ${NAME}
 
 FROM ${BASE_IMAGE} AS final
 COPY --from=build / /
+USER biocbuild
+WORKDIR /home/biocbuild
 ENTRYPOINT ["/bin/bash", "-c"]
 CMD ["/bbs_r_start"]
 

startup_bbs_standalone_devel.sh startup_bbs_standalone.shstartup_bbs_standalone_devel.sh renamed to startup_bbs_standalone.sh

@@ -26,13 +26,19 @@ sudo cp -r bioconductor_salt/saltstack/salt /srv
 sudo cp -r bioconductor_salt/saltstack/pillar /srv
 sudo cp bioconductor_salt/saltstack/minion.d/minion.conf /etc/salt/minion
 
-if [ "${1}" = "nvidia-noble" ]; then
+if [ "${1}" = "devel" ]; then
+	cycle="devel"
+else
+	cycle="release"
+fi
+
+if [ "${2}" = "nvidia-noble" ]; then
 	opt="_gpu"
 else
 	opt=""
 fi
 
-sudo mv /srv/pillar/custom/devel_standalone${opt}.sls /srv/pillar/custom/init.sls
+sudo mv /srv/pillar/custom/${cycle}_standalone${opt}.sls /srv/pillar/custom/init.sls
 
 sudo salt-call --local state.highstate || true