From 04ed4eb1d63a19fbf80235239d0f9e3bb38a922c Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sat, 29 Oct 2022 00:14:31 +0200
Subject: [PATCH] adapted docker ubuntu-20

---
 docker/ubuntu-20.04/Dockerfile    |  5 +++++
 docker/ubuntu-20.04/README.md     | 19 ++++++++++++++++---
 docker/ubuntu-20.04/docker_run.sh |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile
index 5c3fab542..d9138aa0d 100644
--- a/docker/ubuntu-20.04/Dockerfile
+++ b/docker/ubuntu-20.04/Dockerfile
@@ -4,10 +4,15 @@ ENV LANG C
 ENV DEBIAN_FRONTEND noninteractive
 # qtbase5-dev skipped
 RUN apt-get update && \
+    apt-get upgrade -y && \
     apt-get dist-upgrade -y && \
     apt-get install -y --no-install-recommends git ca-certificates build-essential cmake pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev libbz2-dev libbluetooth-dev libpython3-dev libssl-dev sudo && \
     apt-get clean
 
+RUN apt install -y python3-minimal && \
+    apt install -y python3-pip && \
+    python3 -m pip install ansicolors sslcrypto
+
 # Create rrg user
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
diff --git a/docker/ubuntu-20.04/README.md b/docker/ubuntu-20.04/README.md
index f586fe064..d8c7b3f53 100644
--- a/docker/ubuntu-20.04/README.md
+++ b/docker/ubuntu-20.04/README.md
@@ -1,9 +1,22 @@
+# Notes on run_tests.sh script
+This script does both setup the mirrors and pip install and then run a 
+bunch of different builds with make and cmake together with the different combos 
+of RDV4, GENERIC, BTADDON combos. 
+
+If all tests OK,  the script will finish.
+
+
 # Notes to run tests
+The script is to be run in proxmark root folder inside the docker env.
+
+```
+docker/ubuntu-20.04/run_tests.sh;
+``` 
+
+Or if you want to run single test,  
 
 ```
 sudo apt update
-sudo apt install -y python3-minimal
-sudo apt install -y python3-pip
-python3 -m pip install ansicolors sslcrypto
+make clean; make -j
 tools/pm3_tests.sh --long
 ```
diff --git a/docker/ubuntu-20.04/docker_run.sh b/docker/ubuntu-20.04/docker_run.sh
index bb68ba6f8..dd05c9f79 100755
--- a/docker/ubuntu-20.04/docker_run.sh
+++ b/docker/ubuntu-20.04/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-20.04:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-ubuntu-20.04:1.0