Commit e07893c8 authored by garciay's avatar garciay
Browse files

Merge branch 'TTCN_3_Developments' of... 

Merge branch 'TTCN_3_Developments' of https://forge.etsi.org/gitlab/emergency-communications/NG112 into TTCN_3_Developments
parents d97fc760 916bd59d

docker/Dockerfile

+113 −120
Original line number Original line Diff line number Diff line
@@ -108,13 +108,6 @@ RUN cd /home/etsi/dev \ 
    && rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && . /home/etsi/devenv.bash \

    && . /home/etsi/devenv.bash \

    && cd /home/etsi/dev/STF549_Ng112/scripts \

    && cd /home/etsi/dev/STF549_Ng112/scripts \

    && ./build_titan.bash \

    && ./build_titan.bash 

    && . /home/etsi/devenv.bash \

    && ./update_emcom_project.bash \

    && cd ${HOME}/dev/etsi_emcom/src/AtsNg112/objs \

    && ../bin/ng112.bash \

    && ../bin/run_all.bash 



CMD ["/bin/bash"]





# That's all Floks
 
# That's all Floks

docker/build-container.sh

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ 
DOCKER_FILE=./Dockerfile

DOCKER_FILE=./Dockerfile

if [ -f ${DOCKER_FILE} ]

if [ -f ${DOCKER_FILE} ]

then

then

    docker build --tag stf549_ng112 --force-rm .

    docker build --tag stf549_ng112 . # --force-rm

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

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

    then

    then

        echo "Docker build failed: $?"

        echo "Docker build failed: $?"

docker/run-container.sh

+6 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,12 @@ 
#set -e

#set -e

#set -vx

#set -vx





docker run -it --rm stf549_ng112:latest /bin/bash

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

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

		&& /home/etsi/dev/STF549_Ng112/scripts/update_emcom_project.bash \

	    && cd ${HOME}/dev/etsi_emcom/src/AtsNg112/objs \

	    && ../bin/ng112.bash \

	    && ../bin/run_all.bash"





# That's all Floks

# That's all Floks

exit 0
 
exit 0