From 8364df066d212b6aa2a9406372f679448a5b32ba Mon Sep 17 00:00:00 2001
From: ps <ps1337@mailbox.org>
Date: Wed, 14 Nov 2018 07:29:44 +0100
Subject: [PATCH] docker/Dockerfile: Fix image building (#932)

Signed-off-by: ps1337 <ps1337@mailbox.org>
---
 docker/Dockerfile | 66 +++++++++++++++++------------------------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3bd3fc34..949ac248 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,51 +4,32 @@ LABEL maintainer "pschmied <ps1337@mailbox.org>"
 # Dependencies
 RUN apt-get update && \
     apt-get -y install \
-        cmake \
-        curl \
-        g++ \
-        gcc \
-        git-core \
-        gosu \
-        libqt5svg5-dev \
-        make \
-        pkg-config \
-        python3 \
-        python3-dev \
-        qtbase5-dev \
-        qtwebengine5-dev \
-        unzip \
-        wget
+    cmake \
+    curl \
+    g++ \
+    gcc \
+    git-core \
+    gosu \
+    libqt5svg5-dev \
+    make \
+    pkg-config \
+    python3 \
+    python3-dev \
+    qt5-default \
+    qtbase5-dev \
+    qtwebengine5-dev \
+    unzip \
+    wget
 
 # Get latest cutter release
 WORKDIR /opt
-RUN curl https://api.github.com/repos/radareorg/cutter/releases/latest | \
-        grep "zipball_url" | \
-        tr -d ",\" " | \
-        cut -d ":" -f 2,3 | \
-    wget -O cutter.zip -i - && \
-    unzip cutter.zip && \
-    rm cutter.zip && \
-    mv radareorg-cutter* cutter
-
-# Get latest radare2 release and build it
-WORKDIR /opt/cutter
-RUN rm -rf radare2 && \
-    curl https://api.github.com/repos/radare/radare2/releases/latest | \
-        grep "zipball_url" | \
-        tr -d ",\" " | \
-        cut -d ":" -f 2,3 | \
-    wget -O radare2.zip -i - && \
-    unzip radare2.zip && \
-    rm radare2.zip && \
-    mv radare-radare2* radare2 && \
-    cd radare2 && ./sys/install.sh
+RUN git clone --recurse-submodules https://github.com/radareorg/cutter.git && \
+    cd cutter && \
+    git checkout tags/$(git tag | tail -1)
 
 # Build cutter
-RUN mkdir build
-WORKDIR /opt/cutter/build
-RUN cmake ../src && \
-    make
+WORKDIR /opt/cutter
+RUN bash build.sh
 
 # Add r2 user
 RUN useradd r2
@@ -56,9 +37,8 @@ RUN useradd r2
 # Prepare files to mount configurations later on
 RUN mkdir /var/sharedFolder && \
     mkdir -p /home/r2/.config/radare2 && \
-    touch /home/r2/.radare2rc
-
-RUN chown -R r2:r2 /var/sharedFolder && \
+    touch /home/r2/.radare2rc && \
+    chown -R r2:r2 /var/sharedFolder && \
     chown -R r2:r2 /home/r2/
 
 WORKDIR /home/r2