From 410eb7aba44cb94814e1465792dec2f9a463d8c0 Mon Sep 17 00:00:00 2001
From: ps <ps1337@mailbox.org>
Date: Tue, 29 Jan 2019 14:09:39 +0100
Subject: [PATCH] Dockerfile: Use Cutter from master, merge layers (#1141)

---
 docker/Dockerfile | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index d16d47cc..e280defa 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,18 +21,11 @@ RUN apt-get update && \
     unzip \
     wget
 
-# Get latest cutter release
-WORKDIR /opt
-RUN git clone --recurse-submodules https://github.com/radareorg/cutter.git && \
-    cd cutter && \
-    git checkout tags/$(git tag | tail -1)
-
-# Build cutter
-WORKDIR /opt/cutter
-RUN bash build.sh
-
-# Check it afterwards
-RUN bash -c 'if [[ ! -x "/opt/cutter/build/Cutter" ]]; then exit -1; fi'
+# Get, compile and test Cutter from master branch
+RUN git clone --recurse-submodules https://github.com/radareorg/cutter.git /opt/cutter && \
+    cd /opt/cutter && \
+    bash build.sh && \
+    bash -c 'if [[ ! -x "/opt/cutter/build/Cutter" ]]; then exit -1; fi'
 
 # Add r2 user
 RUN useradd r2