Commit 66096001 authored by YannGarcia's avatar YannGarcia
Browse files

Enhance docker support

parent 32a51e22

.jenkins.sh

+5 −1
Original line number Diff line number Diff line
@@ -12,4 +12,8 @@ run_dir=`pwd` 
# Docker version 2

cd docker

./build.sh #--force-stfubuntu

#./run.sh
 
./run.sh



cd $run_dir

docker/home/etc/init.d/30-osip.sh

+1 −1
Original line number Diff line number Diff line
@@ -9,6 +9,6 @@ git clone https://git.savannah.gnu.org/git/osip.git ./osip 
cd osip

./autogen.sh

./configure --prefix=/home/etsi

make && sudo make install

make && make install



cd ${HOME}

docker/run.sh

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

set -vx



docker run --interactive --tty --rm --publish 2222:22 --env DISPLAY=$DISPLAY --volume /tmp/.X11-unix:/tmp/.X11-unix --cap-add=NET_RAW --cap-add=NET_ADMIN ets_ng112:latest

docker run --interactive --tty --rm --publish 2222:22 --env DISPLAY=$DISPLAY --volume /tmp/.X11-unix:/tmp/.X11-unix --cap-add=NET_RAW --cap-add=NET_ADMIN --user etsi ttf_t009_ng112:latest /bin/bash -c ". /home/etsi/devenv.bash && export ATS=AtsNg112 && cd /home/etsi/dev/ETSI_Ng112/etc/AtsNg112 && ln -sf AtsNg112_Gridgears_lis.cfg_ AtsNg112.cfg && cd /home/etsi/dev/ETSI_Ng112/scripts && ./run_all.bash"



# That's all Floks

exit 0

etc/AtsNg112/AtsNg112_Gridgears_lis.cfg_

+4 −3
Original line number Diff line number Diff line
@@ -11,17 +11,18 @@ LibCommon_Time.PX_TAC := 30.0 
LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibItsHttp_Pics.PICS_HEADER_HOST := "lis1.gridgears.plugtests.net"

LibItsHttp_Pics.PICS_HEADER_HOST := "lis.demo.gridgears.io"



LibItsHttp_Pics.PICS_HTTP_VERSION_MINOR := 0;

LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/held+xml;charset=utf-8"

#LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/lost+xml;charset=utf-8"



# LIS PICS

#LibNg112_Pics.PICS_LIS_URI := "/?x-api-key=5637d3fa-3d42-4a50-a8bf-422ae1052d87/"

LibNg112_Pics.PICS_LIS_URI := "/"

LibNg112_Pics.PICS_HTTP_POST_GET_KEEP_ALIVE := false



LibNg112_Pixits.PX_V_POLICE_PATH := "ecrf1.gridgears.plugtests.net"

LibNg112_Pixits.PX_V_POLICE_PATH := "ecrf1.gridgears.io"

LibNg112_Pixits.PX_DEVICE_NUMBER_POINT_POS := { 43.6230132402414, 7.04618453979492 };



# PSAP01
@@ -62,7 +63,7 @@ LogEventTypes:= Yes 
# In this section you can specify parameters that are passed to Test Ports.



# LIS

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis1.gridgears.plugtests.net,port=443,use_ssl=1)"

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=lis.demo.gridgears.io,port=443,use_ssl=1)"



[DEFINE]

# In this section you can create macro definitions,