From bffcebbb07da43326d122119c5059ea8ac6eec07 Mon Sep 17 00:00:00 2001
From: Quentin Dufour <quentin@deuxfleurs.fr>
Date: Mon, 2 Sep 2019 11:22:59 +0200
Subject: [PATCH] Add two version of our own Tor binary

---
 Dockerfile | 47 +++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4933615..d7c57ce 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,25 @@
 FROM fedora:30 as builder
-RUN dnf install -y cmake gcc gcc-c++ ninja-build glib2-devel
+RUN dnf install -y \
+  coreutils \
+  cmake \
+  make \
+  gcc \
+  gcc-c++ \
+  ninja-build \
+  glib2-devel \
+  libevent-devel \
+  zlib-devel \
+  openssl-devel \
+  autoconf \
+  automake \
+  libzstd-devel \
+  xz-devel \
+  git
+  
 WORKDIR /home/donar-build
 RUN chown -R 1000 /home/donar-build
 USER 1000
+
 COPY ./src ./src
 COPY CMakeLists.txt .
 RUN mkdir out && \
@@ -10,8 +27,32 @@ RUN mkdir out && \
     cmake -GNinja .. && \
     ninja
 
+RUN git clone --single-branch --branch patch/relay_2 https://gitlab.inria.fr/qdufour/wide-tor.git tor2 && \
+  cd ./tor2 && \
+  ./autogen.sh && \
+  ./configure --disable-asciidoc || cat config.log && \
+  make -j`nproc`
+
+RUN git clone --single-branch --branch master https://gitlab.inria.fr/qdufour/wide-tor.git tor3 && \
+  cd ./tor3 && \
+  ./autogen.sh && \
+  ./configure --disable-asciidoc && \
+  make -j`nproc`
+
+#####
+
 FROM fedora:30
-RUN dnf install -y glib2 tor valgrind nmap-ncat psmisc
+RUN dnf install -y \
+  glib2 \
+  valgrind \
+  nmap-ncat \
+  psmisc \
+  libevent \
+  zlib \
+  openssl \
+  libzstd \
+  xz-libs
+
 WORKDIR /home/donar
 RUN mkdir /home/donar/shared && mkdir /home/donar/res && chown -R 1000 /home/donar
 USER 1000
@@ -20,5 +61,7 @@ COPY --from=builder /home/donar-build/out/donar /usr/local/bin
 COPY --from=builder /home/donar-build/out/measlat /usr/local/bin
 COPY --from=builder /home/donar-build/out/udpecho /usr/local/bin
 COPY --from=builder /home/donar-build/out/torecho /usr/local/bin
+COPY --from=builder /home/donar-build/tor2/src/app/tor /usr/local/bin/tor2
+COPY --from=builder /home/donar-build/tor3/src/app/tor /usr/local/bin/tor3
 COPY ./scripts/* /usr/local/bin/
 COPY ./torrc_simple /etc/torrc