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

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

parent dd1b6ac5

titan-test-system-framework @ 554d6b6b

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

AtsIPv6OverGeoNetworking @ 566cc49b

Compare 3e3e90ce to 566cc49b
Original line number Original line Diff line number Diff line 
Subproject commit 3e3e90ce7c54d4b3ab1e2551778d8d52aade506c
 
Subproject commit 566cc49bf1b16aa64c26dea40268c8cd0c7acab6

module @ affc1fa4

Compare 732c9934 to affc1fa4
Original line number Original line Diff line number Diff line 
Subproject commit 732c9934d2c87966b5ab9ba4e6886f353d5e4ace
 
Subproject commit affc1fa4e6497ff138b79a958caa79532fba6857

virtualization/docker/Dockerfile

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




# Install dependencies

# Install dependencies

RUN apk update && \

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

# Create user and sudouser

RUN \

RUN \

virtualization/docker/docker-run.sh

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

cd "$(dirname ${BASH_SOURCE})"





docker run --rm -it \

docker run --rm -it \

        -w $HOME/dev/TS.ITS \

        -w $HOME/dev/TS.ITS_r2 \

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

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

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

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

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

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

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

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

        alpine-its:latest "$@"

        alpine-its:latest "$@"

#        -p 0.0.0.0:80:80 \

#        -p 0.0.0.0:80:80 \

#        -p 0.0.0.0:443:443 \
 
#        -p 0.0.0.0:443:443 \