Commit 37ac0539 authored by Yann Garcia's avatar Yann Garcia
Browse files

Review README.md file and review dockerized TITAN compiler part

parent 264df5dd

README.md

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ Procedure: 
- Clone the ETSI ITS protocols project into $HOME/dev folder



```sh

$ git clone --recurse-submodules --branch=devel2 https://forge.etsi.org/gitlab/ITS/TS.ITS.git ./TS.ITS

$ git clone --recurse-submodules --branch=devel2 https://forge.etsi.org/gitlab/ITS/TS.ITS.git

```



- Execute the script install.sh

virtualization/docker/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ FROM alpine:3.16 


# Install dependencies

RUN apk update && \

    apk add --no-cache autoconf automake sudo make git g++ diffutils expect openssl-dev libxml2-dev libxml2-utils libxslt-dev libtool ncurses-dev jsoncpp-dev readline-dev flex bison perl libexecinfo-dev bash libedit libedit-dev lksctp-tools lksctp-tools-dev libpcap-dev curl

    apk add --no-cache autoconf automake sudo make git g++ diffutils expect openssl-dev libxml2-dev libxml2-utils libxslt-dev libtool ncurses-dev jsoncpp-dev readline-dev flex bison perl libexecinfo-dev bash libedit libedit-dev lksctp-tools lksctp-tools-dev libpcap-dev zlib-dev curl



# Create user and sudouser

RUN \
@@ -49,6 +49,6 @@ WORKDIR /home/etsi/dev 


EXPOSE 80/tcp 443/tcp 12340-12349/udp



ENTRYPOINT ["/home/etsi/dev/TS.ITS_r2/virtualization/docker/docker-entrypoint.sh"]

ENTRYPOINT ["/home/etsi/dev/TS.ITS.devel2/virtualization/docker/docker-entrypoint.sh"]



CMD ["help"]

virtualization/docker/README.md

+2 −2
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ Procedure on the host machine: 
- Clone the ETSI ITS Test System



```sh

$ git clone --recurse-submodules --single-branch https://forge.etsi.org/gitlab/ITS/TS.ITS.git

$ git clone --recurse-submodules --branch=devel2 https://forge.etsi.org/gitlab/ITS/TS.ITS.git

cd ${HOME}/dev/TS.ITS/titan-test-system-framework

git checkout devel

cd ./ttcn/LibHttp

ln -sf module_its.mk module.mk

ln module_its.mk module.mk

cd ${HOME}/dev/TS.ITS/ttcn/LibIts

git checkout devel

```

virtualization/docker/docker-entrypoint.sh

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ usage() { 
	echo "e.g. docker-run.sh build Security # To build the AtsSecurity test suite"

}



cli="${GEN_DIR}/bin/TS.ITS_r2"

cli="${GEN_DIR}/bin/TS.ITS.devel2"



commands="help,build,clean,ip,list,modulepar,ping,rebuild,build-run,run,version"

virtualization/docker/docker-run.sh

+7 −1
Original line number Diff line number Diff line
@@ -3,7 +3,13 @@ set -exo pipefail 


cd "$(dirname ${BASH_SOURCE})"



PRJ=TS.ITS_r2

if [ -z "$ATS" ]

then

        echo "ATS environement variable shall be defined (e.g. export ATS=AtsCAM)"

        exit -1

fi



PRJ=TS.ITS

docker run --rm -it \

        -w $HOME/dev/$PRJ \

        -e GEN_DIR=$HOME/dev/$PRJ \