Commit 764363d4 authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixed in Docker scripts

parent 11478dee

docker/build-container.sh

+9 −4
Original line number Diff line number Diff line
@@ -3,20 +3,25 @@ 
# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt



#set -e

#set -vx

set -vx



DOCKER_FILE=./docker/Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    docker rm --force stf569_Mec

    docker build --tag stf569_Mec --force-rm -f ${DOCKER_FILE} .

    #check and build stf569_mec image

    DOCKER_ID=`docker ps -a | grep -e stf569_mec | awk '{ print $1 }'`

    if [ ! -z "${DOCKER_ID}" ]

    then

        docker rm --force stf569_mec

    fi

    docker build --tag stf569_mec --force-rm -f ${DOCKER_FILE} .

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

        exit -1

    fi

    docker image ls -a

    docker inspect stf569_Mec:latest

    docker inspect stf569_mec:latest

    if [ "$?" != "0" ]

    then

        echo "Docker inspect failed: $?"

docker/run-container.sh

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
#set -e

#set -vx



docker run stf569_Mec:latest "/bin/bash" \

docker run stf569_mec:latest "/bin/bash" \

	-c "source /home/etsi/devenv.bash \

	    && cd /home/etsi/dev/etsi_emcom/src/AtsMec/objs \

	    && cd /home/etsi/dev/etsi_mec/src/AtsMec/objs \

	    && ../bin/run_all.bash \

      && ls -ltr ../logs"