Upgrade build stack

This commit is contained in:
Quentin 2019-05-15 15:52:39 +02:00
parent 36443827ed
commit 772960b67c
3 changed files with 5 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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