From 12775960dc5780cdf4bb8e039cf2cd973f93ccb8 Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 18 Dec 2024 22:18:05 +0100
Subject: [PATCH] Refactor Docker scripts

---
 docker/archlinux/docker_build.sh              | 12 ------------
 docker/archlinux/docker_conf                  |  2 --
 docker/archlinux/docker_rm.sh                 |  5 -----
 docker/archlinux/docker_run.sh                | 10 ----------
 docker/build-all.sh                           |  2 +-
 .../docker_build.sh => build.sh}              |  8 +++++++-
 docker/debian-11-bullseye/docker_build.sh     | 12 ------------
 docker/debian-11-bullseye/docker_conf         |  2 --
 docker/debian-11-bullseye/docker_rm.sh        |  5 -----
 docker/debian-11-bullseye/docker_run.sh       | 10 ----------
 docker/debian-12-bookworm-arm64/Dockerfile    |  2 +-
 docker/debian-12-bookworm-arm64/docker_conf   |  3 ---
 docker/debian-12-bookworm-arm64/docker_rm.sh  |  5 -----
 docker/debian-12-bookworm-armhf/Dockerfile    |  2 +-
 .../debian-12-bookworm-armhf/docker_build.sh  | 19 -------------------
 docker/debian-12-bookworm-armhf/docker_conf   |  3 ---
 docker/debian-12-bookworm-armhf/docker_rm.sh  |  5 -----
 docker/debian-12-bookworm-armhf/docker_run.sh | 10 ----------
 docker/debian-12-bookworm/docker_build.sh     | 12 ------------
 docker/debian-12-bookworm/docker_conf         |  2 --
 docker/debian-12-bookworm/docker_rm.sh        |  5 -----
 docker/debian-12-bookworm/docker_run.sh       | 10 ----------
 docker/debian-13-trixie/docker_build.sh       | 12 ------------
 docker/debian-13-trixie/docker_conf           |  2 --
 docker/debian-13-trixie/docker_rm.sh          |  5 -----
 docker/debian-13-trixie/docker_run.sh         | 10 ----------
 docker/fedora-36/docker_build.sh              | 12 ------------
 docker/fedora-36/docker_conf                  |  2 --
 docker/fedora-36/docker_rm.sh                 |  5 -----
 docker/fedora-36/docker_run.sh                | 10 ----------
 docker/fedora-37/docker_build.sh              | 12 ------------
 docker/fedora-37/docker_conf                  |  2 --
 docker/fedora-37/docker_rm.sh                 |  5 -----
 docker/fedora-37/docker_run.sh                | 10 ----------
 docker/homebrew/README.md                     |  2 ++
 docker/homebrew/docker_build.sh               | 12 ------------
 docker/homebrew/docker_conf                   |  2 --
 docker/homebrew/docker_rm.sh                  |  5 -----
 docker/homebrew/docker_run.sh                 | 11 -----------
 docker/kali/docker_build.sh                   | 12 ------------
 docker/kali/docker_conf                       |  2 --
 docker/kali/docker_rm.sh                      |  5 -----
 docker/kali/docker_run.sh                     | 10 ----------
 docker/opensuse-leap/docker_build.sh          | 12 ------------
 docker/opensuse-leap/docker_conf              |  2 --
 docker/opensuse-leap/docker_rm.sh             |  5 -----
 docker/opensuse-leap/docker_run.sh            | 10 ----------
 docker/opensuse-tumbleweed/docker_build.sh    | 12 ------------
 docker/opensuse-tumbleweed/docker_conf        |  2 --
 docker/opensuse-tumbleweed/docker_rm.sh       |  5 -----
 docker/opensuse-tumbleweed/docker_run.sh      | 10 ----------
 docker/parrot-core-latest/docker_build.sh     | 12 ------------
 docker/parrot-core-latest/docker_conf         |  2 --
 docker/parrot-core-latest/docker_rm.sh        |  5 -----
 docker/parrot-core-latest/docker_run.sh       | 10 ----------
 docker/rm.sh                                  |  9 +++++++++
 .../docker_run.sh => run.sh}                  |  6 +++++-
 docker/ubuntu-18.04/docker_build.sh           | 12 ------------
 docker/ubuntu-18.04/docker_conf               |  2 --
 docker/ubuntu-18.04/docker_rm.sh              |  5 -----
 docker/ubuntu-18.04/docker_run.sh             | 10 ----------
 docker/ubuntu-20.04/docker_build.sh           | 12 ------------
 docker/ubuntu-20.04/docker_conf               |  2 --
 docker/ubuntu-20.04/docker_rm.sh              |  5 -----
 docker/ubuntu-20.04/docker_run.sh             | 10 ----------
 docker/ubuntu-22.04/docker_build.sh           | 12 ------------
 docker/ubuntu-22.04/docker_conf               |  2 --
 docker/ubuntu-22.04/docker_rm.sh              |  5 -----
 docker/ubuntu-22.04/docker_run.sh             | 10 ----------
 69 files changed, 26 insertions(+), 457 deletions(-)
 delete mode 100755 docker/archlinux/docker_build.sh
 delete mode 100644 docker/archlinux/docker_conf
 delete mode 100644 docker/archlinux/docker_rm.sh
 delete mode 100755 docker/archlinux/docker_run.sh
 rename docker/{debian-12-bookworm-arm64/docker_build.sh => build.sh} (77%)
 delete mode 100755 docker/debian-11-bullseye/docker_build.sh
 delete mode 100644 docker/debian-11-bullseye/docker_conf
 delete mode 100644 docker/debian-11-bullseye/docker_rm.sh
 delete mode 100755 docker/debian-11-bullseye/docker_run.sh
 delete mode 100644 docker/debian-12-bookworm-arm64/docker_conf
 delete mode 100644 docker/debian-12-bookworm-arm64/docker_rm.sh
 delete mode 100755 docker/debian-12-bookworm-armhf/docker_build.sh
 delete mode 100644 docker/debian-12-bookworm-armhf/docker_conf
 delete mode 100644 docker/debian-12-bookworm-armhf/docker_rm.sh
 delete mode 100755 docker/debian-12-bookworm-armhf/docker_run.sh
 delete mode 100755 docker/debian-12-bookworm/docker_build.sh
 delete mode 100644 docker/debian-12-bookworm/docker_conf
 delete mode 100644 docker/debian-12-bookworm/docker_rm.sh
 delete mode 100755 docker/debian-12-bookworm/docker_run.sh
 delete mode 100755 docker/debian-13-trixie/docker_build.sh
 delete mode 100644 docker/debian-13-trixie/docker_conf
 delete mode 100644 docker/debian-13-trixie/docker_rm.sh
 delete mode 100755 docker/debian-13-trixie/docker_run.sh
 delete mode 100755 docker/fedora-36/docker_build.sh
 delete mode 100644 docker/fedora-36/docker_conf
 delete mode 100644 docker/fedora-36/docker_rm.sh
 delete mode 100755 docker/fedora-36/docker_run.sh
 delete mode 100755 docker/fedora-37/docker_build.sh
 delete mode 100644 docker/fedora-37/docker_conf
 delete mode 100644 docker/fedora-37/docker_rm.sh
 delete mode 100755 docker/fedora-37/docker_run.sh
 delete mode 100755 docker/homebrew/docker_build.sh
 delete mode 100644 docker/homebrew/docker_conf
 delete mode 100644 docker/homebrew/docker_rm.sh
 delete mode 100755 docker/homebrew/docker_run.sh
 delete mode 100755 docker/kali/docker_build.sh
 delete mode 100644 docker/kali/docker_conf
 delete mode 100644 docker/kali/docker_rm.sh
 delete mode 100755 docker/kali/docker_run.sh
 delete mode 100755 docker/opensuse-leap/docker_build.sh
 delete mode 100644 docker/opensuse-leap/docker_conf
 delete mode 100644 docker/opensuse-leap/docker_rm.sh
 delete mode 100755 docker/opensuse-leap/docker_run.sh
 delete mode 100755 docker/opensuse-tumbleweed/docker_build.sh
 delete mode 100644 docker/opensuse-tumbleweed/docker_conf
 delete mode 100644 docker/opensuse-tumbleweed/docker_rm.sh
 delete mode 100755 docker/opensuse-tumbleweed/docker_run.sh
 delete mode 100755 docker/parrot-core-latest/docker_build.sh
 delete mode 100644 docker/parrot-core-latest/docker_conf
 delete mode 100644 docker/parrot-core-latest/docker_rm.sh
 delete mode 100755 docker/parrot-core-latest/docker_run.sh
 create mode 100755 docker/rm.sh
 rename docker/{debian-12-bookworm-arm64/docker_run.sh => run.sh} (68%)
 delete mode 100755 docker/ubuntu-18.04/docker_build.sh
 delete mode 100644 docker/ubuntu-18.04/docker_conf
 delete mode 100644 docker/ubuntu-18.04/docker_rm.sh
 delete mode 100755 docker/ubuntu-18.04/docker_run.sh
 delete mode 100755 docker/ubuntu-20.04/docker_build.sh
 delete mode 100644 docker/ubuntu-20.04/docker_conf
 delete mode 100644 docker/ubuntu-20.04/docker_rm.sh
 delete mode 100755 docker/ubuntu-20.04/docker_run.sh
 delete mode 100755 docker/ubuntu-22.04/docker_build.sh
 delete mode 100644 docker/ubuntu-22.04/docker_conf
 delete mode 100644 docker/ubuntu-22.04/docker_rm.sh
 delete mode 100755 docker/ubuntu-22.04/docker_run.sh

diff --git a/docker/archlinux/docker_build.sh b/docker/archlinux/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/archlinux/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/archlinux/docker_conf b/docker/archlinux/docker_conf
deleted file mode 100644
index b17f6e93d..000000000
--- a/docker/archlinux/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-arch:1.0
diff --git a/docker/archlinux/docker_rm.sh b/docker/archlinux/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/archlinux/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/archlinux/docker_run.sh b/docker/archlinux/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/archlinux/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/build-all.sh b/docker/build-all.sh
index b3c7a9905..a71727ee6 100755
--- a/docker/build-all.sh
+++ b/docker/build-all.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 for os in archlinux debian-12-bookworm debian-12-bookworm-arm64 debian-12-bookworm-armhf debian-13-trixie fedora-36 fedora-37 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-20.04 ubuntu-22.04; do
-  (  cd $os && ./docker_build.sh )
+  (  cd $os && ../build.sh )
 done
diff --git a/docker/debian-12-bookworm-arm64/docker_build.sh b/docker/build.sh
similarity index 77%
rename from docker/debian-12-bookworm-arm64/docker_build.sh
rename to docker/build.sh
index de56acca7..dc2b12bf4 100755
--- a/docker/debian-12-bookworm-arm64/docker_build.sh
+++ b/docker/build.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-. docker_conf
+if [ ! -e docker_conf.inc ]; then
+    echo "This script must be run from within one of the subfolders"
+    exit 1
+fi
+. docker_conf.inc
 # Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
 UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
 if [ -n "$UART_PORT" ]; then
@@ -10,10 +14,12 @@ else
     BUILDARG=""
 fi
 
+# For cross-platform support:
 # cf https://github.com/multiarch/qemu-user-static
 #sudo apt install qemu-user-static
 #docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 #docker buildx create --use
 #docker buildx inspect --bootstrap
 #docker buildx build $DOCKER_PLATFORM $BUILDARG -t "$DOCKER_IMAGE" --load .
+# Seems to work without buildx:
 docker build $DOCKER_PLATFORM $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/debian-11-bullseye/docker_build.sh b/docker/debian-11-bullseye/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/debian-11-bullseye/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/debian-11-bullseye/docker_conf b/docker/debian-11-bullseye/docker_conf
deleted file mode 100644
index fa951cd04..000000000
--- a/docker/debian-11-bullseye/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-debian-bullseye:1.0
diff --git a/docker/debian-11-bullseye/docker_rm.sh b/docker/debian-11-bullseye/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/debian-11-bullseye/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-11-bullseye/docker_run.sh b/docker/debian-11-bullseye/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/debian-11-bullseye/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm-arm64/Dockerfile b/docker/debian-12-bookworm-arm64/Dockerfile
index 6f1ab5226..792014812 100644
--- a/docker/debian-12-bookworm-arm64/Dockerfile
+++ b/docker/debian-12-bookworm-arm64/Dockerfile
@@ -19,7 +19,7 @@ RUN if [ -n "${UART_GID}" ]; then \
   fi
 RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
 
-#USER rrg
+USER rrg
 WORKDIR "/home/rrg"
 
 CMD ["/bin/bash"]
diff --git a/docker/debian-12-bookworm-arm64/docker_conf b/docker/debian-12-bookworm-arm64/docker_conf
deleted file mode 100644
index 67627ddaf..000000000
--- a/docker/debian-12-bookworm-arm64/docker_conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-debian-bookworm-arm64:1.0
-DOCKER_PLATFORM="--platform linux/arm64"
diff --git a/docker/debian-12-bookworm-arm64/docker_rm.sh b/docker/debian-12-bookworm-arm64/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/debian-12-bookworm-arm64/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm-armhf/Dockerfile b/docker/debian-12-bookworm-armhf/Dockerfile
index c17e66926..e5d5acf2b 100644
--- a/docker/debian-12-bookworm-armhf/Dockerfile
+++ b/docker/debian-12-bookworm-armhf/Dockerfile
@@ -19,7 +19,7 @@ RUN if [ -n "${UART_GID}" ]; then \
   fi
 RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
 
-#USER rrg
+USER rrg
 WORKDIR "/home/rrg"
 
 CMD ["/bin/bash"]
diff --git a/docker/debian-12-bookworm-armhf/docker_build.sh b/docker/debian-12-bookworm-armhf/docker_build.sh
deleted file mode 100755
index de56acca7..000000000
--- a/docker/debian-12-bookworm-armhf/docker_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-
-# cf https://github.com/multiarch/qemu-user-static
-#sudo apt install qemu-user-static
-#docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-#docker buildx create --use
-#docker buildx inspect --bootstrap
-#docker buildx build $DOCKER_PLATFORM $BUILDARG -t "$DOCKER_IMAGE" --load .
-docker build $DOCKER_PLATFORM $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/debian-12-bookworm-armhf/docker_conf b/docker/debian-12-bookworm-armhf/docker_conf
deleted file mode 100644
index 55bb22582..000000000
--- a/docker/debian-12-bookworm-armhf/docker_conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-debian-bookworm-armhf:1.0
-DOCKER_PLATFORM="--platform linux/arm/v7"
diff --git a/docker/debian-12-bookworm-armhf/docker_rm.sh b/docker/debian-12-bookworm-armhf/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/debian-12-bookworm-armhf/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm-armhf/docker_run.sh b/docker/debian-12-bookworm-armhf/docker_run.sh
deleted file mode 100755
index a62889fa0..000000000
--- a/docker/debian-12-bookworm-armhf/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV $DOCKER_PLATFORM --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm/docker_build.sh b/docker/debian-12-bookworm/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/debian-12-bookworm/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/debian-12-bookworm/docker_conf b/docker/debian-12-bookworm/docker_conf
deleted file mode 100644
index 965092c9b..000000000
--- a/docker/debian-12-bookworm/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-debian-bookworm:1.0
diff --git a/docker/debian-12-bookworm/docker_rm.sh b/docker/debian-12-bookworm/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/debian-12-bookworm/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm/docker_run.sh b/docker/debian-12-bookworm/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/debian-12-bookworm/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/debian-13-trixie/docker_build.sh b/docker/debian-13-trixie/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/debian-13-trixie/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/debian-13-trixie/docker_conf b/docker/debian-13-trixie/docker_conf
deleted file mode 100644
index 5360f9255..000000000
--- a/docker/debian-13-trixie/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-debian-trixie:1.0
diff --git a/docker/debian-13-trixie/docker_rm.sh b/docker/debian-13-trixie/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/debian-13-trixie/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-13-trixie/docker_run.sh b/docker/debian-13-trixie/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/debian-13-trixie/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/fedora-36/docker_build.sh b/docker/fedora-36/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/fedora-36/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/fedora-36/docker_conf b/docker/fedora-36/docker_conf
deleted file mode 100644
index 3d4b629b7..000000000
--- a/docker/fedora-36/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-fedora-36:1.0
diff --git a/docker/fedora-36/docker_rm.sh b/docker/fedora-36/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/fedora-36/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/fedora-36/docker_run.sh b/docker/fedora-36/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/fedora-36/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/fedora-37/docker_build.sh b/docker/fedora-37/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/fedora-37/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/fedora-37/docker_conf b/docker/fedora-37/docker_conf
deleted file mode 100644
index 66bb5e1c0..000000000
--- a/docker/fedora-37/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-fedora-37:1.0
diff --git a/docker/fedora-37/docker_rm.sh b/docker/fedora-37/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/fedora-37/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/fedora-37/docker_run.sh b/docker/fedora-37/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/fedora-37/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/homebrew/README.md b/docker/homebrew/README.md
index 3ebc5a9ed..664db5de3 100644
--- a/docker/homebrew/README.md
+++ b/docker/homebrew/README.md
@@ -1,5 +1,7 @@
 # Notes on linux homebrew
 
+If needed to install sth, run brew as user linuxbrew
+
 Do not `brew install arm-none-eabi-gcc`, it's a Mach-O executable.
 
 So only host bins can be built (except tools/hitag2crack/crack5opencl which needs OpenCL)
diff --git a/docker/homebrew/docker_build.sh b/docker/homebrew/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/homebrew/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/homebrew/docker_conf b/docker/homebrew/docker_conf
deleted file mode 100644
index 2488be8d6..000000000
--- a/docker/homebrew/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-brew:1.0
diff --git a/docker/homebrew/docker_rm.sh b/docker/homebrew/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/homebrew/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/homebrew/docker_run.sh b/docker/homebrew/docker_run.sh
deleted file mode 100755
index 0fec9fd33..000000000
--- a/docker/homebrew/docker_run.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
-# if needed, run brew as user linuxbrew
diff --git a/docker/kali/docker_build.sh b/docker/kali/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/kali/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/kali/docker_conf b/docker/kali/docker_conf
deleted file mode 100644
index 866db4d67..000000000
--- a/docker/kali/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-kali:1.0
diff --git a/docker/kali/docker_rm.sh b/docker/kali/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/kali/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/kali/docker_run.sh b/docker/kali/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/kali/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/opensuse-leap/docker_build.sh b/docker/opensuse-leap/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/opensuse-leap/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/opensuse-leap/docker_conf b/docker/opensuse-leap/docker_conf
deleted file mode 100644
index 6c7e804e5..000000000
--- a/docker/opensuse-leap/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-suse-leap:1.0
diff --git a/docker/opensuse-leap/docker_rm.sh b/docker/opensuse-leap/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/opensuse-leap/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/opensuse-leap/docker_run.sh b/docker/opensuse-leap/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/opensuse-leap/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/opensuse-tumbleweed/docker_build.sh b/docker/opensuse-tumbleweed/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/opensuse-tumbleweed/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/opensuse-tumbleweed/docker_conf b/docker/opensuse-tumbleweed/docker_conf
deleted file mode 100644
index c40603d93..000000000
--- a/docker/opensuse-tumbleweed/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-suse-tumbleweed:1.0
diff --git a/docker/opensuse-tumbleweed/docker_rm.sh b/docker/opensuse-tumbleweed/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/opensuse-tumbleweed/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/opensuse-tumbleweed/docker_run.sh b/docker/opensuse-tumbleweed/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/opensuse-tumbleweed/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/parrot-core-latest/docker_build.sh b/docker/parrot-core-latest/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/parrot-core-latest/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/parrot-core-latest/docker_conf b/docker/parrot-core-latest/docker_conf
deleted file mode 100644
index 3fc87ccab..000000000
--- a/docker/parrot-core-latest/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-parrotsec-core-latest:1.0
diff --git a/docker/parrot-core-latest/docker_rm.sh b/docker/parrot-core-latest/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/parrot-core-latest/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/parrot-core-latest/docker_run.sh b/docker/parrot-core-latest/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/parrot-core-latest/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/rm.sh b/docker/rm.sh
new file mode 100755
index 000000000..32a3b1b16
--- /dev/null
+++ b/docker/rm.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ ! -e docker_conf.inc ]; then
+    echo "This script must be run from within one of the subfolders"
+    exit 1
+fi
+. docker_conf.inc
+docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
+docker image rm "$DOCKER_IMAGE"
diff --git a/docker/debian-12-bookworm-arm64/docker_run.sh b/docker/run.sh
similarity index 68%
rename from docker/debian-12-bookworm-arm64/docker_run.sh
rename to docker/run.sh
index a62889fa0..34d8fd106 100755
--- a/docker/debian-12-bookworm-arm64/docker_run.sh
+++ b/docker/run.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 
-. docker_conf
+if [ ! -e docker_conf.inc ]; then
+    echo "This script must be run from within one of the subfolders"
+    exit 1
+fi
+. docker_conf.inc
 UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
 if [ -n "$UART_PORT" ]; then
     DEV="--device=/dev/tty0 --device=$UART_PORT"
diff --git a/docker/ubuntu-18.04/docker_build.sh b/docker/ubuntu-18.04/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/ubuntu-18.04/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/ubuntu-18.04/docker_conf b/docker/ubuntu-18.04/docker_conf
deleted file mode 100644
index 1a9a20ae8..000000000
--- a/docker/ubuntu-18.04/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-ubuntu-18.04:1.0
diff --git a/docker/ubuntu-18.04/docker_rm.sh b/docker/ubuntu-18.04/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/ubuntu-18.04/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/ubuntu-18.04/docker_run.sh b/docker/ubuntu-18.04/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/ubuntu-18.04/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/ubuntu-20.04/docker_build.sh b/docker/ubuntu-20.04/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/ubuntu-20.04/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/ubuntu-20.04/docker_conf b/docker/ubuntu-20.04/docker_conf
deleted file mode 100644
index 65ae052b1..000000000
--- a/docker/ubuntu-20.04/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-ubuntu-20.04:1.0
diff --git a/docker/ubuntu-20.04/docker_rm.sh b/docker/ubuntu-20.04/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/ubuntu-20.04/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/ubuntu-20.04/docker_run.sh b/docker/ubuntu-20.04/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/ubuntu-20.04/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"
diff --git a/docker/ubuntu-22.04/docker_build.sh b/docker/ubuntu-22.04/docker_build.sh
deleted file mode 100755
index d0c94091e..000000000
--- a/docker/ubuntu-22.04/docker_build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-# Make sure to connect a Proxmark3 when building if you want to be able to access it from within the Docker instance
-UART_PORT="$(../../pm3 --list|grep /dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    UART_GID="$(stat -c '%g' $UART_PORT)"
-    BUILDARG="--build-arg UART_GID=$UART_GID"
-else
-    BUILDARG=""
-fi
-docker build $BUILDARG -t "$DOCKER_IMAGE" .
diff --git a/docker/ubuntu-22.04/docker_conf b/docker/ubuntu-22.04/docker_conf
deleted file mode 100644
index b5d8532d8..000000000
--- a/docker/ubuntu-22.04/docker_conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# sourceme
-DOCKER_IMAGE=pm3-ubuntu-22.04:1.0
diff --git a/docker/ubuntu-22.04/docker_rm.sh b/docker/ubuntu-22.04/docker_rm.sh
deleted file mode 100644
index 3705c37bb..000000000
--- a/docker/ubuntu-22.04/docker_rm.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-docker rm $(docker ps -aq --filter ancestor="$DOCKER_IMAGE")
-docker image rm "$DOCKER_IMAGE"
diff --git a/docker/ubuntu-22.04/docker_run.sh b/docker/ubuntu-22.04/docker_run.sh
deleted file mode 100755
index fe28c846d..000000000
--- a/docker/ubuntu-22.04/docker_run.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-. docker_conf
-UART_PORT="$(../../pm3 --list|grep dev|head -n1|cut -d' ' -f2)"
-if [ -n "$UART_PORT" ]; then
-    DEV="--device=/dev/tty0 --device=$UART_PORT"
-else
-    DEV=""
-fi
-docker run $DEV --volume="$(pwd)/../..:/home/rrg/proxmark3" -w /home/rrg/proxmark3 -it "$DOCKER_IMAGE"