update docker stuff

docker/archlinux/docker_rm.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-arch:1.0)
 docker image rm pm3-arch:1.0
-docker image rm archlinux:base
-# old ref:
-docker image rm archlinux/base

docker/build-all.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for os in archlinux debian-buster fedora-36 fedora-37 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-22.04; do
+for os in archlinux debian-12-bookworm 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 )
 done

docker/debian-11-bullseye/README.md

@@ -9,7 +9,7 @@ If all tests OK,  the script will finish with PASS.
 The script is to be run in proxmark root folder inside the docker env.
 
 ```
-docker/debian-bullseye/run_tests.sh;
+docker/debian-11-bullseye/run_tests.sh;
 ```
 
 Or if you want to run single test,

docker/debian-11-bullseye/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker rm $(docker ps -aq --filter ancestor=pm3-debian-bullseye:1.0)
+docker image rm pm3-debian-bullseye:1.0

docker/debian-11-bullseye/run_tests.sh

@@ -2,7 +2,7 @@
 # Iceman 2022
 #
 # This script is to be run from proxmark root folder inside the docker env
-# docker/debian-bullseye/run_tests.sh;
+# docker/debian-11-bullseye/run_tests.sh;
 
 sudo apt update && sudo apt upgrade -y
 tools/release_tests.sh

docker/debian-12-bookworm/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:bookworm-slim
+
+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 liblz4-dev libbluetooth-dev libpython3-dev libssl-dev sudo && \
+    apt-get clean
+
+RUN apt-get install -y --no-install-recommends python3-minimal python3-pip python3-venv && \
+    apt-get clean
+
+RUN apt-get install -y opencl-dev && \
+    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"]

docker/debian-12-bookworm/README.md

@@ -0,0 +1,26 @@
+# Notes on run_tests.sh script
+This script runs 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 with PASS.
+
+
+# Notes to run tests
+The script is to be run in proxmark root folder inside the docker env.
+
+```
+docker/debian-12-bookworm/run_tests.sh;
+```
+
+Or if you want to run single test,
+
+```
+sudo apt update
+make clean; make -j
+python3 -m venv /tmp/venv
+source /tmp/venv/bin/activate
+python3 -m pip install --use-pep517 pyaes
+python3 -m pip install ansicolors sslcrypto
+tools/pm3_tests.sh --long
+deactivate
+```

docker/debian-12-bookworm/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-debian-bookworm:1.0" .

docker/debian-12-bookworm/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker rm $(docker ps -aq --filter ancestor=pm3-debian-bookworm:1.0)
+docker image rm pm3-debian-bookworm:1.0

docker/debian-12-bookworm/docker_run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-debian-bookworm:1.0

docker/debian-12-bookworm/run_tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# This script is to be run from proxmark root folder inside the docker env
+# docker/debian-12-bookworm/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+python3 -m venv /tmp/venv
+source /tmp/venv/bin/activate
+python3 -m pip install --use-pep517 pyaes
+python3 -m pip install ansicolors sslcrypto
+tools/release_tests.sh
+deactivate

docker/debian-13-trixie/Dockerfile

@@ -0,0 +1,26 @@
+FROM debian:trixie-slim
+
+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 liblz4-dev libbluetooth-dev libpython3-dev libssl-dev sudo && \
+    apt-get clean
+
+RUN apt-get install -y --no-install-recommends python3-minimal python3-pip python3-venv && \
+    apt-get clean
+
+RUN apt-get install -y opencl-dev && \
+    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"]

docker/debian-13-trixie/README.md

@@ -0,0 +1,26 @@
+# Notes on run_tests.sh script
+This script runs 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 with PASS.
+
+
+# Notes to run tests
+The script is to be run in proxmark root folder inside the docker env.
+
+```
+docker/debian-13-trixie/run_tests.sh;
+```
+
+Or if you want to run single test,
+
+```
+sudo apt update
+make clean; make -j
+python3 -m venv /tmp/venv
+source /tmp/venv/bin/activate
+python3 -m pip install --use-pep517 pyaes
+python3 -m pip install ansicolors sslcrypto
+tools/pm3_tests.sh --long
+deactivate
+```

docker/debian-13-trixie/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-debian-trixie:1.0" .

docker/debian-13-trixie/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker rm $(docker ps -aq --filter ancestor=pm3-debian-trixie:1.0)
+docker image rm pm3-debian-trixie:1.0

docker/debian-13-trixie/docker_run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-debian-trixie:1.0

docker/debian-13-trixie/run_tests.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# This script is to be run from proxmark root folder inside the docker env
+# docker/debian-13-trixie/run_tests.sh;
+
+sudo apt update && sudo apt upgrade -y
+python3 -m venv /tmp/venv
+source /tmp/venv/bin/activate
+python3 -m pip install --use-pep517 pyaes
+python3 -m pip install ansicolors sslcrypto
+tools/release_tests.sh
+deactivate

docker/debian-bullseye/docker_rm.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-debian-bullseye:1.0
-docker image rm bullseye-slim

docker/fedora-36/docker_rm.sh

@@ -2,4 +2,3 @@
 
 docker rm $(docker ps -aq --filter ancestor=pm3-fedora-36:1.0)
 docker image rm pm3-fedora-36:1.0
-docker image rm fedora:36

docker/fedora-37/docker_rm.sh

@@ -2,4 +2,3 @@
 
 docker rm $(docker ps -aq --filter ancestor=pm3-fedora-37:1.0)
 docker image rm pm3-fedora-37:1.0
-docker image rm fedora:37

docker/homebrew/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-brew:1.0)
 docker image rm pm3-brew:1.0
-docker image rm homebrew/brew

docker/kali/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-kali:1.0)
 docker image rm pm3-kali:1.0
-#docker image rm kalilinux/kali-rolling

docker/opensuse-leap/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-suse-leap:1.0)
 docker image rm pm3-suse-leap:1.0
-docker image rm opensuse/leap

docker/opensuse-tumbleweed/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-suse-tumbleweed:1.0)
 docker image rm pm3-suse-tumbleweed:1.0
-docker image rm opensuse/tumbleweed

docker/parrot-core-latest/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-parrotsec-core-latest:1.0)
 docker image rm pm3-parrotsec-core-latest:1.0
-docker image rm parrotsec/core:latest

docker/ubuntu-18.04/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-18.04:1.0)
 docker image rm pm3-ubuntu-18.04:1.0
-docker image rm ubuntu:18.04

docker/ubuntu-20.04/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-20.04:1.0)
 docker image rm pm3-ubuntu-20.04:1.0
-docker image rm ubuntu:20.04

docker/ubuntu-22.04/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
+docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-22.04:1.0)
 docker image rm pm3-ubuntu-22.04:1.0
-docker image rm ubuntu:22.04