Commit dc1af394 authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixed in docker/run.sh

parent 81f080a7

ccsrc/Protocols/Tcp/tcp_layer.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -79,9 +79,9 @@ tcp_layer::tcp_layer(const std::string & p_type, const std::string & param) : la 
    parameter_set("serverPort", _params[params::local_port].c_str());

    parameter_set("serverPort", _params[params::local_port].c_str());

    if (ssl_mode) { // Add certificate bundle

    if (ssl_mode) { // Add certificate bundle

      parameter_set(ssl_verifycertificate_name(), "yes");

      parameter_set(ssl_verifycertificate_name(), "yes");

      parameter_set(ssl_private_key_file_name(), "../certificates/out/privates/486c4cb43fcbcdb5f564824ad201cffb405f3d3659fc1facd5f5cb21d4ea64e0_server_rsa.key.pem");

      parameter_set(ssl_private_key_file_name(), "../certificates/out/privates/e5e11abad8003766e4a7b721afb175a189b5f4cc7046af9b0d8eaebb86f28c40_server_dsa.key.pem");

      parameter_set(ssl_certificate_file_name(), "../certificates/out/certs/486c4cb43fcbcdb5f564824ad201cffb405f3d3659fc1facd5f5cb21d4ea64e0_server_rsa.cert.pem");

      parameter_set(ssl_certificate_file_name(), "../certificates/out/certs/e5e11abad8003766e4a7b721afb175a189b5f4cc7046af9b0d8eaebb86f28c40_server_dsa.cert.pem");

      parameter_set(ssl_trustedCAlist_file_name(), "../certificates/out/certs/CA_rsa.cert.pem"); // FIXME Use a parameter

      parameter_set(ssl_trustedCAlist_file_name(), "../certificates/out/certs/CA_dsa.cert.pem"); // FIXME Use a parameter

    }

    }

  }

  }

  set_ttcn_buffer_usercontrol(false);

  set_ttcn_buffer_usercontrol(false);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ make 




echo -e "*****************************\n* Init Eclipse Workspace\n*****************************\n"

echo -e "*****************************\n* Init Eclipse Workspace\n*****************************\n"





echo -e "*****************************\n* Build Mec test suite\n*****************************\n"

echo -e "*****************************\n* Setup a configuration file\n*****************************\n"

cd ./etc/AtsMec

cd ./etc/AtsMec

ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg

ln -sf AtsMec_Sandbox.cf_ AtsMec.cfg

cd -

cd -

docker/run.sh

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

#set -e

set -vx

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 ttf_t012_mec: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 ttf_t012_mec:latest /bin/bash -c "export ATS=AtsMec && cd ~ && . ./devenv.bash && sed --in-place 's/sbxpl1eil4/sbxrsvoat/g' ~/dev/TTF_T012_Mec/etc/AtsMec/AtsMec.cfg && cd ~/dev/TTF_T012_Mec/scripts && ./run_all.bash"

#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 ttf_t012_mec:latest





# That's all Floks

# That's all Floks

exit 0
 
exit 0

etc/AtsMec/AtsMec_Sandbox.cf_

+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json" 
LibItsHttp_Pics.PICS_USE_TOKEN_HEADER    := true

LibItsHttp_Pics.PICS_USE_TOKEN_HEADER    := true

#LibItsHttp_Pics.PICS_TOKEN_HEADER        := "Basic WrongToken"

#LibItsHttp_Pics.PICS_TOKEN_HEADER        := "Basic WrongToken"





LibMec_Pics.PICS_ROOT_API               := "/sbxpl1eil4" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'

LibMec_Pics.PICS_ROOT_API               := "/sbxzzmplso" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'





# LibMec_Pixits

# LibMec_Pixits

LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI     := "/location/v2/queries/zones"

LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI     := "/location/v2/queries/zones"