From a28a2cb52a9c0af7f82433a96deca9c51ebe7944 Mon Sep 17 00:00:00 2001
From: Chris Humphries <chris@sogonsecurity.com>
Date: Wed, 23 Dec 2020 19:04:05 -0500
Subject: [PATCH] Ubuntu 19.10 to 20.10, no more python 2, replace radare2 with
 rizin, remove i386 arch

---
 Dockerfile | 25 ++++++++++---------------
 build.sh   |  2 +-
 run.sh     |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36e5923..4ef7154 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,24 +7,19 @@
 # Run the docker container -> run.sh
 # Get a shell in the container -> shell.sh
 
-FROM ubuntu:19.10
+FROM ubuntu:20.10
 ENV LC_CTYPE C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 COPY dot_radare2rc /root/.radare2rc
 #COPY dot_bashrc /root/.bashrc
-RUN dpkg --add-architecture i386 && \
-apt-get update && \
+RUN apt-get update && \
 apt-get install -y build-essential jq strace ltrace curl wget rubygems gcc dnsutils netcat gcc-multilib net-tools \
   vim gdb gdb-multiarch python python3 python3-pip python3-dev libssl-dev libffi-dev wget git make procps \
-  libpcre3-dev libdb-dev libxt-dev libxaw7-dev python-pip libc6:i386 libncurses5:i386 libstdc++6:i386 emacs-nox && \
-pip install capstone requests pwntools r2pipe && \
-pip3 install pwntools keystone-engine unicorn capstone ropper && \
-mkdir tools && cd tools && \
-git clone https://github.com/JonathanSalwan/ROPgadget && \
-git clone https://github.com/radare/radare2 && \ 
-cd .. && git clone https://github.com/pwndbg/pwndbg && cd pwndbg && git checkout stable && ./setup.sh && \
-cd .. && git clone https://github.com/niklasb/libc-database && \
-gem install one_gadget
-
-
-# radare2 -> cd radare2 && sys/install.sh 
\ No newline at end of file
+  libpcre3-dev libdb-dev libxt-dev libxaw7-dev emacs-nox && \
+pip install capstone requests pwntools r2pipe pwntools keystone-engine unicorn capstone ropper meson ninja && \
+mkdir /tools && \
+cd /tools && git clone https://github.com/JonathanSalwan/ROPgadget && \
+cd /tools && git clone https://github.com/niklasb/libc-database && \
+cd /tools && git clone https://github.com/hugsy/gef && sh -c "$(curl -fsSL http://gef.blah.cat/sh)" && \ 
+cd /tools && git clone --recurse-submodules https://github.com/rizinorg/rizin && \
+cd rizin && meson build && ninja -C build && ninja -C build install
diff --git a/build.sh b/build.sh
index 07c1c11..a5a58b9 100755
--- a/build.sh
+++ b/build.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker build -t docker-binaryexploitation:ubuntu19.10 .
+docker build -t docker-binaryexploitation:ubuntu20.10 .
diff --git a/run.sh b/run.sh
index 5fbf51c..5d3119d 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-docker run --rm -v "$(pwd)/host:/host" -v "$(pwd)/logs:/logs" --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -d --name docker-binaryexploitation -i docker-binaryexploitation:ubuntu19.10
+docker run --rm -v "$(pwd)/host:/host" -v "$(pwd)/logs:/logs" --cap-add=SYS_PTRACE --security-opt seccomp=unconfined -d --name docker-binaryexploitation -i docker-binaryexploitation:ubuntu20.10