From 4c60aed563c96f7062bbb3e37a6e1d7d8d91344f Mon Sep 17 00:00:00 2001
From: "Yannick M. Dixken" <yannick@dixken.de>
Date: Fri, 15 May 2020 00:31:20 +0200
Subject: [PATCH 1/3] fixed the docker build process by installing pip manually

---
 dockerfile       | 7 ++++++-
 dockerfile-nogit | 8 ++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dockerfile b/dockerfile
index d6fb504ef..0ee1ea43d 100644
--- a/dockerfile
+++ b/dockerfile
@@ -14,8 +14,13 @@ COPY ./ /havocsrc
 
 #Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y tar wget dfu-util cmake python python-pip && \
+	apt-get install -y tar wget dfu-util cmake python curl && \
 	apt-get -qy autoremove
+
+#Install pip from PyPa
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+	python get-pip.py
+
 #Fetch additional dependencies from Python 2.x pip
 RUN pip install pyyaml
 
diff --git a/dockerfile-nogit b/dockerfile-nogit
index 0ed6247d8..1de8f6f5e 100644
--- a/dockerfile-nogit
+++ b/dockerfile-nogit
@@ -11,9 +11,13 @@ WORKDIR /havoc/firmware
 
 # Fetch dependencies from APT
 RUN apt-get update && \
-	apt-get install -y git tar wget dfu-util cmake python3 python-pip ccache && \
+	apt-get install -y git tar wget dfu-util cmake python3 ccache curl && \
 	apt-get -qy autoremove
 
+#Install pip from PyPa
+RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+	python get-pip.py
+
 RUN pip install pyyaml
 
 # Grab the GNU ARM toolchain from arm.com
@@ -28,4 +32,4 @@ RUN mkdir ~/bin && cd ~/bin && \
 	for tool in gcc g++ cpp c++;do ln -s $(which ccache) arm-none-eabi-$tool;done
 
 CMD cd .. && cd build && \
-    cmake .. && make firmware
\ No newline at end of file
+    cmake .. && make firmware

From e87a0888424c8a986637de1e3d35831589bda56b Mon Sep 17 00:00:00 2001
From: "Yannick M. Dixken" <yannick@dixken.de>
Date: Fri, 15 May 2020 00:40:24 +0200
Subject: [PATCH 2/3] fixed the docker build process by installing pip manually

---
 dockerfile       | 2 +-
 dockerfile-nogit | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dockerfile b/dockerfile
index 0ee1ea43d..6cdd9ba47 100644
--- a/dockerfile
+++ b/dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
 	apt-get install -y tar wget dfu-util cmake python curl && \
 	apt-get -qy autoremove
 
-#Install pip from PyPa
+#Install current pip from PyPa
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 	python get-pip.py
 
diff --git a/dockerfile-nogit b/dockerfile-nogit
index 1de8f6f5e..b1dd378d9 100644
--- a/dockerfile-nogit
+++ b/dockerfile-nogit
@@ -14,10 +14,11 @@ RUN apt-get update && \
 	apt-get install -y git tar wget dfu-util cmake python3 ccache curl && \
 	apt-get -qy autoremove
 
-#Install pip from PyPa
+#Install current pip from PyPa
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
 	python get-pip.py
 
+#Fetch additional dependencies from Python 3.x pip
 RUN pip install pyyaml
 
 # Grab the GNU ARM toolchain from arm.com

From 9f0b8852f6d79c83b92f038c395510be2ca5d4a6 Mon Sep 17 00:00:00 2001
From: "Yannick M. Dixken" <yannick@dixken.de>
Date: Fri, 15 May 2020 01:08:23 +0200
Subject: [PATCH 3/3] fixed the invokation of python for get-pip.py

---
 dockerfile-nogit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dockerfile-nogit b/dockerfile-nogit
index b1dd378d9..2a351b9d3 100644
--- a/dockerfile-nogit
+++ b/dockerfile-nogit
@@ -16,7 +16,7 @@ RUN apt-get update && \
 
 #Install current pip from PyPa
 RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
-	python get-pip.py
+	python3 get-pip.py
 
 #Fetch additional dependencies from Python 3.x pip
 RUN pip install pyyaml