From 3eeb9eab74f632ab5fffa88994f766e376c9b40f Mon Sep 17 00:00:00 2001
From: Anton Kochkov <anton.kochkov@gmail.com>
Date: Mon, 11 May 2020 18:53:17 +0800
Subject: [PATCH] Fix Docker build (#16809)

---
 Dockerfile | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e5144319d7..a37f6aa13e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,8 +28,8 @@
 # $ r2 -d /bin/true
 #
 
-# Using debian 9 as base image.
-FROM debian:9
+# Using debian 10 as base image.
+FROM debian:10
 
 # Label base
 LABEL r2docker latest
@@ -37,18 +37,14 @@ LABEL r2docker latest
 # Radare version
 ARG R2_VERSION=master
 # R2pipe python version
-ARG R2_PIPE_PY_VERSION=0.8.9
-# R2pipe node version
-ARG R2_PIPE_NPM_VERSION=2.3.2
+ARG R2_PIPE_PY_VERSION=1.4.2
 
 ENV R2_VERSION ${R2_VERSION}
 ENV R2_PIPE_PY_VERSION ${R2_PIPE_PY_VERSION}
-ENV R2_PIPE_NPM_VERSION ${R2_PIPE_NPM_VERSION}
 
 RUN echo -e "Building versions:\n\
   R2_VERSION=$R2_VERSION\n\
-  R2_PIPE_PY_VERSION=${R2_PIPE_PY_VERSION}\n\
-  R2_PIPE_NPM_VERSION=${R2_PIPE_NPM_VERSION}"
+  R2_PIPE_PY_VERSION=${R2_PIPE_PY_VERSION}"
 
 # Build radare2 in a volume to minimize space used by build
 VOLUME ["/mnt"]
@@ -62,6 +58,7 @@ RUN DEBIAN_FRONTEND=noninteractive dpkg --add-architecture i386 && \
   apt-get update && \
   apt-get install -y \
   curl \
+  wget \
   gcc \
   git \
   bison \
@@ -72,15 +69,13 @@ RUN DEBIAN_FRONTEND=noninteractive dpkg --add-architecture i386 && \
   libncurses5:i386 \
   libstdc++6:i386 \
   gnupg2 \
-  sudo && \
-  curl -sL https://deb.nodesource.com/setup_8.x | bash - && \
-  apt-get install -y nodejs python-pip && \
+  python-pip && \
   pip install r2pipe=="$R2_PIPE_PY_VERSION" && \
-  npm install --unsafe-perm -g "r2pipe@$R2_PIPE_NPM_VERSION" && \
   cd /mnt && \
   git clone -b "$R2_VERSION" -q --depth 1 https://github.com/radareorg/radare2.git && \
   cd radare2 && \
-  ./sys/install.sh && \
+  ./configure && \
+  make && \
   make install && \
   apt-get install -y xz-utils && \
   apt-get remove --purge -y \