Commit 554e0d58 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Minor fixes.

parent 2e878abd
Loading
Loading
Loading
Loading
+1 −31
Original line number Diff line number Diff line
#!/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
+1 −1
Original line number Diff line number Diff line
#!/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
+1 −1
Original line number Diff line number Diff line
@@ -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"