From 554e0d589f15d56f0741093de297a4ab12ce1946 Mon Sep 17 00:00:00 2001
From: Stefano Alberto Russo <stefano.russo@gmail.com>
Date: Wed, 8 Jan 2020 12:27:28 +0100
Subject: [PATCH] Minor fixes.

---
 Software/MetaDesktop/build.sh              | 32 +---------------------
 Software/MetaDesktop/run.sh                |  2 +-
 examples/build_tag_push_run-metadesktop.sh |  2 +-
 3 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/Software/MetaDesktop/build.sh b/Software/MetaDesktop/build.sh
index 411d42b..1d25d83 100755
--- a/Software/MetaDesktop/build.sh
+++ b/Software/MetaDesktop/build.sh
@@ -1,33 +1,3 @@
 #!/bin/bash
 
-if [ ! -f "Docker/Dockerfile" ]; then
-    # TODO: This check is weak: improve me!
-    echo "Please run this script from the project root folder"
-    exit 1
-fi
-
-# Move to the root directory to allow accessing the code in Docker build context
-OR_DIR=$PWD
-cd Docker
-
-# Are we on a Git repo?
-#echo ""
-#git status &> /dev/null
-#if [[ "x$?" == "x0" ]] ; then
-#    CHANGES=$(git status | grep "Changes not staged for commit") 
-#    if [[ "x$CHANGES" == "x" ]] ; then
-#        TAG=$(git rev-parse HEAD | cut -c1-7)
-#        echo "I will tag this container with the Git short hash \"$TAG\" "
-#    else
-#        TAG="latest"
-#        echo "You have uncomitted changes, I will not tag this container with the Git short hash. "
-#    fi
-#else
-#    TAG="latest"
-#fi
-#echo ""
-
-# Use --no-cache in case of build problems (i.e. 404 not found)
-docker build  . -t sarusso/metadesktop
-
-cd $OR_DIR
+docker build  . -t rosetta/metadesktop
diff --git a/Software/MetaDesktop/run.sh b/Software/MetaDesktop/run.sh
index 165a775..0531880 100755
--- a/Software/MetaDesktop/run.sh
+++ b/Software/MetaDesktop/run.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-docker run -v$PWD/:/data -p5900:5900 -p8590:8590 -it sarusso/metadesktop
+docker run -v$PWD/:/data -p5900:5900 -p8590:8590 -it rosetta/metadesktop
diff --git a/examples/build_tag_push_run-metadesktop.sh b/examples/build_tag_push_run-metadesktop.sh
index 55c8781..09b7589 100755
--- a/examples/build_tag_push_run-metadesktop.sh
+++ b/examples/build_tag_push_run-metadesktop.sh
@@ -14,7 +14,7 @@ docker tag rosetta/metadesktop localhost:5000/rosetta/metadesktop
 docker push localhost:5000/rosetta/metadesktop
 
 # Run
-rosetta/shell slurmclustermaster-main "SINGULARITY_NOHTTPS=true singularity run --writable-tmpfs --containall --cleanenv docker://dregistry:5000/rosetta/metadesktop"
+rosetta/shell slurmclustermaster-main "SINGULARITY_NOHTTPS=true singularity run --pid --writable-tmpfs --containall --cleanenv docker://dregistry:5000/rosetta/metadesktop"
 
 # Run variants/tests
 # rosetta/shell slurmclustermaster-main "SINGULARITY_NOHTTPS=true singularity run docker://dregistry:5000/rosetta/metadesktop"
-- 
GitLab