Commit 3bd25afc authored by YannGarcia's avatar YannGarcia
Browse files

Add option to force removing Dockerfile.stfubuntu

parent 5991dbf4

.jenkins.sh

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ run_dir=`pwd` 


# Docker version 2

cd docker

./build.sh --force-stfubuntu

./build.sh #--force-stfubuntu

#./run.sh

docker/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ set -vx 


# Force removing stfubuntu docker image

if [ "$1" == "--force-stfubuntu" ]; then

    if [ -z `docker images -q stfubuntu` ]; then

    if [ -n `docker images -q stfubuntu` ]; then

        docker rmi --force `docker images -q stfubuntu` || exit 1

    fi

fi

docker/home/etc/init.d/40-etsi_112.sh

+7 −8
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ ln -sf /home/etsi/dev/ETSI_Ng112/scripts/devenv.bash.ubuntu /home/etsi/devenv.ba 
. /home/etsi/devenv.bash

echo -e "*****************************\n* Apply patched \n*****************************\n"

cd /home/etsi/dev/ETSI_Ng112

cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/

cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/ttcn

cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/

cp ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/

cp ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/

cp ./ttcn/patch_ims_titan/*.ttcn ./ttcn/LibIms/ttcn/