From 772960b67c2b78a7fbf431186c4b99897af19beb Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Wed, 15 May 2019 15:52:39 +0200 Subject: [PATCH] Upgrade build stack --- Dockerfile | 6 +++--- scripts/dup2-client | 2 +- scripts/rrhr-client | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7fbd568..4933615 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 as builder +FROM fedora:30 as builder RUN dnf install -y cmake gcc gcc-c++ ninja-build glib2-devel WORKDIR /home/donar-build RUN chown -R 1000 /home/donar-build @@ -10,8 +10,8 @@ RUN mkdir out && \ cmake -GNinja .. && \ ninja -FROM fedora:29 -RUN dnf install -y glib2 tor valgrind nmap-ncat +FROM fedora:30 +RUN dnf install -y glib2 tor valgrind nmap-ncat psmisc WORKDIR /home/donar RUN mkdir /home/donar/shared && mkdir /home/donar/res && chown -R 1000 /home/donar USER 1000 diff --git a/scripts/dup2-client b/scripts/dup2-client index 17c066b..93e923f 100755 --- a/scripts/dup2-client +++ b/scripts/dup2-client @@ -1,5 +1,5 @@ #!/bin/bash -mkdir -p $4/{log,shared} +mkdir -p $4/{log,shared,res} donar -a dup2 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections diff --git a/scripts/rrhr-client b/scripts/rrhr-client index 47d1d4d..26ed37b 100755 --- a/scripts/rrhr-client +++ b/scripts/rrhr-client @@ -1,5 +1,5 @@ #!/bin/bash -mkdir -p $4/{log,shared} +mkdir -p $4/{log,shared,res} donar -a rr -b -h -l 8 -d 1,1 -c -o $4/shared/onion_services.pub -r 9000 > $4/log/client-donar-stdout.log 2> $4/log/client-donar-stderr.log & sleep 2 measlat -h 127.13.3.7 -p 9000 > /dev/null 2>&1 # Used to wait for connections