Commit 9bde916a authored by garciay's avatar garciay
Browse files

Minor reviews

parent 831efd01

README.md

+4 −2
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ The following procedure applies to build it: 
```sh

$ git clone https://github.com/YannGarcia/wireshark-for-ITS.git wireshark-for-ITS

$ git checkout ITS_Protocol_Support

...

```



- Create a folder ~/frameworks/wireshark-build
@@ -234,11 +235,12 @@ $ git checkout ITS_Protocol_Support 


```sh

$ cmake ../wireshark-for-ITS

...

```



- Add specific compiler options the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:

- Add specific compiler options to the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:

    - Find the variable C_FLAGS

    - Append the following options: "-Wno-unused-const-variable -Wno-unsued-function "

    - Append at the end the following compiler options: "-Wno-unused-const-variable -Wno-unsued-function "

- Build Wireshark/tshark executing the following command



```sh

docker/Dockerfile

+5 −4
Original line number Diff line number Diff line
@@ -7,8 +7,7 @@ LABEL description="STF525 Docker Image" 
ENV TERM=linux

ENV HOSTNAME docker-titan-STF525



ARG USERNAME

ARG PASSWORD

ARG ssh_pub_key



RUN echo "docker-titan-STF525" > /etc/hostname \

    && DEBIAN_FRONTEND=noninteractive apt-get update \
@@ -76,9 +75,11 @@ RUN echo "docker-titan-STF525" > /etc/hostname \ 
USER etsi



RUN cd /home/etsi \

    && mkdir -p bin lib include tmp frameworks docs dev \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \

    && echo "$ssh_pub_key" > /home/etsi/.ssh/id_rsa.pub \

    && cat /home/etsi/.ssh/id_rsa.pub \

    && cd /home/etsi/dev \

    && svn co --username $USERNAME --password $PASSWORD --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

    && svn co --non-interactive https://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

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

    && chmod 775 *.bash devenv.bash.* \

    && cd /home/etsi \

docker/build-container.sh

+6 −2
Original line number Diff line number Diff line
@@ -7,9 +7,13 @@ set -vx 


DOCKER_FILE=./Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    IMAGES=$(docker images -q)

    if [ "${IMAGES}" != "" ]

    then

      docker rmi -f $(docker images -q)

    docker build --tag stf525_its --force-rm --build-arg USERNAME=${USERNAME} --build-arg PASSWORD=${PASSWORD} .

    fi

    docker build --tag stf525_its --force-rm --build-arg ssh_pub_key="$(cat ~/.ssh/id_rsa.pub)" .

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

    then

        echo "Docker build failed: $?"