Commit aad71fa3 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add curl install in Dockerfile; Disable JSON support for Test System

parent ae5e3c88

config.mk

+1 −1
Original line number Diff line number Diff line 
TTCN3_COMPILER_OPTIONS := -d -e -f -g -l -L -R -U none -x -X

TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -l -L -R -U none -x -X

TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

titan-test-system-framework @ 554d6b6b

Original line number Diff line number Diff line 
Subproject commit ffbcefb5dbe4bc24623f5738c8a64153c8f3599d
 
Subproject commit 554d6b6b3ce1e51d88267a3c946cd30caac97a55

virtualization/docker/Dockerfile

+1 −1
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

    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



# Create user and sudouser

RUN \

virtualization/docker/docker-entrypoint.sh

+10 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ usage() { 
	done

}



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

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



if [ $# == 0 ]; then

  usage
@@ -33,15 +33,24 @@ case "$1" in 
  clean)

    cd ${GEN_DIR} && make clean

    ;;

  ip)

    ip address

    ;;

  list)

    ${cli} -l

    ;;

  modulepar)

    ${cli} -p

    ;;

  ping)

    sudo ping $2

    ;;

  rebuild)

    cd ${GEN_DIR} && rm -fr ./bin ./build ; make

    ;;

  build-run)

    d ${GEN_DIR}/scripts && ./run_all.bash 0

    ;;

  run)

    cd ${GEN_DIR}/scripts && ./run_all.bash

    ;;

virtualization/docker/docker-run.sh

+4 −4
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ set +vx 
cd "$(dirname ${BASH_SOURCE})"



docker run --rm -it \

        -w $HOME/dev/TS.ITS \

        -e GEN_DIR=$HOME/dev/TS.ITS \

        -w $HOME/dev/TS.ITS_r1 \

        -e GEN_DIR=$HOME/dev/TS.ITS_r1 \

        -u "$(id -u):$(id -g)" \

        -v "${PWD}/../..:$HOME/dev/TS.ITS" \

        --entrypoint $HOME/dev/TS.ITS/virtualization/docker/docker-entrypoint.sh \

        -v "${PWD}/../..:$HOME/dev/TS.ITS_r1" \

        --entrypoint $HOME/dev/TS.ITS_r1/virtualization/docker/docker-entrypoint.sh \

        alpine-its:latest "$@"

#        -p 0.0.0.0:80:80 \

#        -p 0.0.0.0:443:443 \