docker: add Fedora 41, Ubuntu 24.04 and remove old ones

docker/debian-11-bullseye/README.md

@@ -1,21 +0,0 @@
-# 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-11-bullseye/run_tests.sh;
-```
-
-Or if you want to run single test,
-
-```
-sudo apt update
-make clean; make -j
-tools/pm3_tests.sh --long
-```

docker/debian-11-bullseye/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-debian-bullseye:1.0

docker/debian-11-bullseye/run_tests.sh

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

docker/fedora-36/Dockerfile

@@ -1,27 +0,0 @@
-FROM fedora:36
-
-ENV LANG=C
-# qt5-qtbase-devel skipped
-RUN dnf install -y passwd sudo git make gcc gcc-c++ arm-none-eabi-gcc-cs arm-none-eabi-newlib readline-devel bzip2-devel lz4-devel bluez-libs-devel python3-devel openssl-devel gd-devel libatomic findutils
-
-RUN yum -y update
-RUN yum -y install cmake python-pip
-RUN python3 -m pip install ansicolors sslcrypto
-
-RUN yum -y install mesa-libOpenCL ocl-icd-devel
-
-# Create rrg user
-RUN useradd -ms /bin/bash rrg
-RUN passwd -d rrg
-ARG UART_GID
-# dialout group may already exist on another numeric ID than on host
-RUN if [ -n "${UART_GID}" ]; then \
-    groupadd -g ${UART_GID} mydialout || true; \
-    usermod -aG ${UART_GID} rrg; \
-  fi
-RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
-
-USER rrg
-WORKDIR "/home/rrg"
-
-CMD ["/bin/bash"]

docker/fedora-36/README.md

@@ -1,21 +0,0 @@
-# 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/fedora-36/run_tests.sh;
-```
-
-Or if you want to run single test,
-
-```
-sudo yum -y update
-make clean; make -j
-tools/pm3_tests.sh --long
-```

docker/fedora-36/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-fedora-36:1.0

docker/fedora-37/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-fedora-37:1.0

docker/fedora-37/run_tests.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Iceman 2022
-#
-# This script is to be run from proxmark root folder inside the docker env
-# docker/fedora-36/run_tests.sh;
-
-sudo yum -y update
-tools/release_tests.sh

docker/fedora-41/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:41
 
 ENV LANG=C
 # qt5-qtbase-devel skipped

docker/fedora-41/README.md

@@ -8,7 +8,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/fedora-37/run_tests.sh;
+docker/fedora-41/run_tests.sh;
 ``` 
 
 Or if you want to run single test,  

docker/fedora-41/docker_conf.inc

@@ -0,0 +1 @@
+DOCKER_IMAGE=pm3-fedora-41:1.0

docker/fedora-41/run_tests.sh

@@ -2,7 +2,7 @@
 # Iceman 2022
 #
 # This script is to be run from proxmark root folder inside the docker env
-# docker/fedora-36/run_tests.sh;
+# docker/fedora-41/run_tests.sh;
 
 sudo yum -y update
 tools/release_tests.sh

docker/ubuntu-18.04/Dockerfile

@@ -1,35 +0,0 @@
-FROM ubuntu:18.04
-
-ENV LANG=C
-ENV DEBIAN_FRONTEND=noninteractive
-# qtbase5-dev skipped
-# python3 skipped, not yet searchable with pkg-config python3
-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 libssl-dev libgd-dev sudo && \
-    apt-get clean
-
-RUN apt-get install -y python3-minimal && \
-    apt-get install -y python3-pip && \
-    apt-get clean && \
-    python3 -m pip install ansicolors sslcrypto
-
-RUN apt-get install -y opencl-dev && \
-    apt-get clean
-
-# Create rrg user
-RUN useradd -ms /bin/bash rrg
-RUN passwd -d rrg
-ARG UART_GID
-# dialout group may already exist on another numeric ID than on host
-RUN if [ -n "${UART_GID}" ]; then \
-    groupadd -g ${UART_GID} mydialout || true; \
-    usermod -aG ${UART_GID} rrg; \
-  fi
-RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
-
-USER rrg
-WORKDIR "/home/rrg"
-
-CMD ["/bin/bash"]

docker/ubuntu-18.04/README.md

@@ -1,21 +0,0 @@
-# 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/ubuntu-18.04/run_tests.sh;
-``` 
-
-Or if you want to run single test,  
-
-```
-sudo apt update
-make clean; make -j
-tools/pm3_tests.sh --long
-```

docker/ubuntu-18.04/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-ubuntu-18.04:1.0

docker/ubuntu-18.04/run_tests.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Iceman 2022
-#
-# This script is to be run from proxmark root folder inside the docker env
-# docker/ubuntu-18.04/run_tests.sh;
-
-sudo apt update && sudo apt upgrade -y
-tools/release_tests.sh

docker/ubuntu-20.04/Dockerfile

@@ -1,34 +0,0 @@
-FROM ubuntu:20.04
-
-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 libgd-dev sudo && \
-    apt-get clean
-
-RUN apt-get install -y python3-minimal && \
-    apt-get install -y python3-pip && \
-    apt-get clean && \
-    python3 -m pip install ansicolors sslcrypto
-
-RUN apt-get install -y opencl-dev && \
-    apt-get clean
-
-# Create rrg user
-RUN useradd -ms /bin/bash rrg
-RUN passwd -d rrg
-ARG UART_GID
-# dialout group may already exist on another numeric ID than on host
-RUN if [ -n "${UART_GID}" ]; then \
-    groupadd -g ${UART_GID} mydialout || true; \
-    usermod -aG ${UART_GID} rrg; \
-  fi
-RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
-
-USER rrg
-WORKDIR "/home/rrg"
-
-CMD ["/bin/bash"]

docker/ubuntu-20.04/README.md

@@ -1,21 +0,0 @@
-# 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/ubuntu-20.04/run_tests.sh;
-``` 
-
-Or if you want to run single test,  
-
-```
-sudo apt update
-make clean; make -j
-tools/pm3_tests.sh --long
-```

docker/ubuntu-20.04/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-ubuntu-20.04:1.0

docker/ubuntu-20.04/run_tests.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Iceman 2022
-#
-# This script is to be run from proxmark root folder inside the docker env
-# docker/ubuntu-20.04/run_tests.sh;
-
-sudo apt update && sudo apt upgrade -y
-tools/release_tests.sh

docker/ubuntu-22.04/Dockerfile

@@ -1,34 +0,0 @@
-FROM ubuntu:22.04
-
-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 libgd-dev sudo && \
-    apt-get clean
-
-RUN apt-get install -y python3-minimal && \
-    apt-get install -y python3-pip && \
-    apt-get clean && \
-    python3 -m pip install ansicolors sslcrypto
-
-RUN apt-get install -y opencl-dev && \
-    apt-get clean
-
-# Create rrg user
-RUN useradd -ms /bin/bash rrg
-RUN passwd -d rrg
-ARG UART_GID
-# dialout group may already exist on another numeric ID than on host
-RUN if [ -n "${UART_GID}" ]; then \
-    groupadd -g ${UART_GID} mydialout || true; \
-    usermod -aG ${UART_GID} rrg; \
-  fi
-RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers
-
-USER rrg
-WORKDIR "/home/rrg"
-
-CMD ["/bin/bash"]

docker/ubuntu-22.04/docker_conf.inc

@@ -1 +0,0 @@
-DOCKER_IMAGE=pm3-ubuntu-22.04:1.0

docker/ubuntu-22.04/run_tests.sh

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# Iceman 2022
-#
-# This script is to be run from proxmark root folder inside the docker env
-# docker/ubuntu-22.04/run_tests.sh;
-
-sudo apt update && sudo apt upgrade -y
-tools/release_tests.sh

docker/ubuntu-24.04/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM ubuntu:24.04
 
 ENV LANG=C
 ENV DEBIAN_FRONTEND=noninteractive
@@ -9,15 +9,15 @@ RUN apt-get update && \
     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 libgd-dev sudo && \
     apt-get clean
 
-RUN apt-get install -y python3-minimal && \
+RUN apt-get install -y --no-install-recommends python3-minimal python3-pip python3-venv && \
-    apt-get install -y python3-pip && \
+    apt-get clean
-    apt-get clean && \
-    python3 -m pip install ansicolors sslcrypto
 
 RUN apt-get install -y opencl-dev && \
     apt-get clean
 
-# Create rrg user
+# Create rrg user => there is already a ubuntu user = 1000 that we need to move away
+RUN usermod -u 999 ubuntu
+RUN groupmod -g 999 ubuntu
 RUN useradd -ms /bin/bash rrg
 RUN passwd -d rrg
 ARG UART_GID

docker/ubuntu-24.04/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/ubuntu-22.04/run_tests.sh;
+docker/ubuntu-24.04/run_tests.sh;
 ``` 
 
 Or if you want to run single test,  

docker/ubuntu-24.04/docker_conf.inc

@@ -0,0 +1 @@
+DOCKER_IMAGE=pm3-ubuntu-24.04:1.0

docker/ubuntu-24.04/run_tests.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Iceman 2022
+#
+# This script is to be run from proxmark root folder inside the docker env
+# docker/ubuntu-24.04/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