Commit 7be621f6 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Improvements in the build an rerun commands. Minro fix in the dev docker compose.

parent f6c8d21e

docker-compose-dev.yml

+1 −2
Original line number Original line Diff line number Diff line
@@ -79,7 +79,6 @@ services: 
      #- ROSETTA_TASKS_PROXY_HOST=

      #- ROSETTA_TASKS_PROXY_HOST=

      #- ROSETTA_TASKS_TUNNEL_HOST=

      #- ROSETTA_TASKS_TUNNEL_HOST=

      - ROSETTA_HOST=localhost 

      - ROSETTA_HOST=localhost 

      

    ports:

    ports:

      - "8080:8080"

      - "8080:8080"

      - "7000-7020:7000-7020"

      - "7000-7020:7000-7020"

rosetta/build

+15 −10
Original line number Original line Diff line number Diff line
@@ -29,20 +29,25 @@ fi 
if [[ "x$SERVICE" == "x" ]] ; then

if [[ "x$SERVICE" == "x" ]] ; then

    

    

    # Build all services

    # Build all services

    $BUILD_COMMAND services/base -t rosetta/base

    NOCACHE=$NOCACHE rosetta/build base

    $BUILD_COMMAND services/slurmbase -t rosetta/slurmbase

    NOCACHE=$NOCACHE rosetta/build slurmbase

    $BUILD_COMMAND services/slurmcluster -t rosetta/slurmcluster    

    NOCACHE=$NOCACHE rosetta/build slurmcluster    

    $BUILD_COMMAND services/slurmclustermaster -t rosetta/slurmclustermaster    

    NOCACHE=$NOCACHE rosetta/build slurmclustermaster    

    $BUILD_COMMAND services/slurmclusterworker -t rosetta/slurmclusterworker    

    NOCACHE=$NOCACHE rosetta/build slurmclusterworker    

    $BUILD_COMMAND services/standaloneworker -t rosetta/standaloneworker    

    NOCACHE=$NOCACHE rosetta/build standaloneworker     

    $BUILD_COMMAND services/dregistry -t rosetta/dregistry

    NOCACHE=$NOCACHE rosetta/build dregistry

    $BUILD_COMMAND services/webapp -t rosetta/webapp

    NOCACHE=$NOCACHE rosetta/build webapp

    $BUILD_COMMAND services/postgres -t rosetta/postgres

    NOCACHE=$NOCACHE rosetta/build postgres

    $BUILD_COMMAND services/proxy -t rosetta/proxy

    NOCACHE=$NOCACHE rosetta/build proxy

    

    

else

else





    # Build a specific image

    # Build a specific image

    echo ""

    echo "================================="

    echo " Building $SERVICE..."

    echo "================================="

    echo ""

    $BUILD_COMMAND services/$SERVICE -t rosetta/$SERVICE

    $BUILD_COMMAND services/$SERVICE -t rosetta/$SERVICE





fi
 
fi

rosetta/rerun

+2 −7
Original line number Original line Diff line number Diff line
@@ -10,11 +10,6 @@ if [[ $# -eq 0 ]] ; then 
    docker-compose down

    docker-compose down

    docker-compose up -d

    docker-compose up -d

else

else

    UPDATE_OUT=$(docker-compose up -d --no-deps $@ 2>&1)

    rosetta/clean $@

    if [[ $UPDATE_OUT == *"is up-to-date"* ]]; then

    rosetta/run $@

        echo "Image is up to date, only restarting the service..."

        docker-compose restart $@

    else

        echo "Updated image and restarted the the service."

    fi

fi
 
fi