From 1d2752715dc609856760004ec79a0b1597954d47 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Tue, 25 May 2021 16:45:54 +0200
Subject: [PATCH] docker: ubuntu 18.04 and 20.04

---
 docker/ubuntu/docker_build.sh             |  3 ---
 docker/ubuntu18/Dockerfile                | 19 +++++++++++++++++++
 docker/ubuntu18/docker_build.sh           |  3 +++
 docker/ubuntu18/docker_rm.sh              |  4 ++++
 docker/{ubuntu => ubuntu18}/docker_run.sh |  2 +-
 docker/{ubuntu => ubuntu20}/Dockerfile    |  0
 docker/ubuntu20/docker_build.sh           |  3 +++
 docker/{ubuntu => ubuntu20}/docker_rm.sh  |  2 +-
 docker/ubuntu20/docker_run.sh             |  3 +++
 9 files changed, 34 insertions(+), 5 deletions(-)
 delete mode 100755 docker/ubuntu/docker_build.sh
 create mode 100644 docker/ubuntu18/Dockerfile
 create mode 100755 docker/ubuntu18/docker_build.sh
 create mode 100644 docker/ubuntu18/docker_rm.sh
 rename docker/{ubuntu => ubuntu18}/docker_run.sh (88%)
 rename docker/{ubuntu => ubuntu20}/Dockerfile (100%)
 create mode 100755 docker/ubuntu20/docker_build.sh
 rename docker/{ubuntu => ubuntu20}/docker_rm.sh (56%)
 create mode 100755 docker/ubuntu20/docker_run.sh

diff --git a/docker/ubuntu/docker_build.sh b/docker/ubuntu/docker_build.sh
deleted file mode 100755
index 9c09b3aad..000000000
--- a/docker/ubuntu/docker_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-ubuntu:1.0" .
diff --git a/docker/ubuntu18/Dockerfile b/docker/ubuntu18/Dockerfile
new file mode 100644
index 000000000..94d7f592f
--- /dev/null
+++ b/docker/ubuntu18/Dockerfile
@@ -0,0 +1,19 @@
+FROM ubuntu:18.04
+
+ENV LANG C
+ENV DEBIAN_FRONTEND noninteractive
+# qtbase5-dev skipped
+RUN apt-get update && \
+    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 sudo && \
+    apt-get clean
+
+# Create rrg user
+RUN useradd -ms /bin/bash rrg
+RUN passwd -d rrg
+RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
+
+USER rrg
+WORKDIR "/home/rrg"
+
+CMD ["/bin/bash"]
diff --git a/docker/ubuntu18/docker_build.sh b/docker/ubuntu18/docker_build.sh
new file mode 100755
index 000000000..03ee43fd4
--- /dev/null
+++ b/docker/ubuntu18/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu18:1.0" .
diff --git a/docker/ubuntu18/docker_rm.sh b/docker/ubuntu18/docker_rm.sh
new file mode 100644
index 000000000..8f892ccea
--- /dev/null
+++ b/docker/ubuntu18/docker_rm.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-ubuntu18:1.0
+docker image rm ubuntu:18.04
diff --git a/docker/ubuntu/docker_run.sh b/docker/ubuntu18/docker_run.sh
similarity index 88%
rename from docker/ubuntu/docker_run.sh
rename to docker/ubuntu18/docker_run.sh
index 6d43e4d15..7c41babc0 100755
--- a/docker/ubuntu/docker_run.sh
+++ b/docker/ubuntu18/docker_run.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu18:1.0
diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu20/Dockerfile
similarity index 100%
rename from docker/ubuntu/Dockerfile
rename to docker/ubuntu20/Dockerfile
diff --git a/docker/ubuntu20/docker_build.sh b/docker/ubuntu20/docker_build.sh
new file mode 100755
index 000000000..21f28b4fe
--- /dev/null
+++ b/docker/ubuntu20/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu20:1.0" .
diff --git a/docker/ubuntu/docker_rm.sh b/docker/ubuntu20/docker_rm.sh
similarity index 56%
rename from docker/ubuntu/docker_rm.sh
rename to docker/ubuntu20/docker_rm.sh
index cc02a4231..cb4683c34 100644
--- a/docker/ubuntu/docker_rm.sh
+++ b/docker/ubuntu20/docker_rm.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-ubuntu:1.0
+docker image rm pm3-ubuntu20:1.0
 docker image rm ubuntu:20.04
diff --git a/docker/ubuntu20/docker_run.sh b/docker/ubuntu20/docker_run.sh
new file mode 100755
index 000000000..524f3fb43
--- /dev/null
+++ b/docker/ubuntu20/docker_run.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu20:1.0