From 4547d4ba7cdd0c3cef563259b3ec9fc5ca9b68fd Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 15 Jun 2025 18:17:56 +0200 Subject: [PATCH] fix dockers Fedora 42 & 43 --- docker/fedora-42/run_tests.sh | 5 +++++ docker/fedora-43/run_tests.sh | 5 +++++ docker/ubuntu-24.10/Dockerfile | 34 +++++++++++++++++++++++++++++ docker/ubuntu-24.10/README.md | 20 +++++++++++++++++ docker/ubuntu-24.10/docker_conf.inc | 1 + docker/ubuntu-24.10/run_tests.sh | 13 +++++++++++ docker/ubuntu-25.04/Dockerfile | 34 +++++++++++++++++++++++++++++ docker/ubuntu-25.04/README.md | 20 +++++++++++++++++ docker/ubuntu-25.04/docker_conf.inc | 1 + docker/ubuntu-25.04/run_tests.sh | 13 +++++++++++ 10 files changed, 146 insertions(+) create mode 100644 docker/ubuntu-24.10/Dockerfile create mode 100644 docker/ubuntu-24.10/README.md create mode 100644 docker/ubuntu-24.10/docker_conf.inc create mode 100755 docker/ubuntu-24.10/run_tests.sh create mode 100644 docker/ubuntu-25.04/Dockerfile create mode 100644 docker/ubuntu-25.04/README.md create mode 100644 docker/ubuntu-25.04/docker_conf.inc create mode 100755 docker/ubuntu-25.04/run_tests.sh diff --git a/docker/fedora-42/run_tests.sh b/docker/fedora-42/run_tests.sh index 87f35a9b4..f94642645 100755 --- a/docker/fedora-42/run_tests.sh +++ b/docker/fedora-42/run_tests.sh @@ -5,4 +5,9 @@ # docker/fedora-42/run_tests.sh; sudo yum -y update +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 diff --git a/docker/fedora-43/run_tests.sh b/docker/fedora-43/run_tests.sh index c74e26801..f73e5fb62 100755 --- a/docker/fedora-43/run_tests.sh +++ b/docker/fedora-43/run_tests.sh @@ -5,4 +5,9 @@ # docker/fedora-43/run_tests.sh; sudo yum -y update +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 diff --git a/docker/ubuntu-24.10/Dockerfile b/docker/ubuntu-24.10/Dockerfile new file mode 100644 index 000000000..89abd2516 --- /dev/null +++ b/docker/ubuntu-24.10/Dockerfile @@ -0,0 +1,34 @@ +FROM ubuntu:24.10 + +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 --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 => 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 +# 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"] diff --git a/docker/ubuntu-24.10/README.md b/docker/ubuntu-24.10/README.md new file mode 100644 index 000000000..53a3a2107 --- /dev/null +++ b/docker/ubuntu-24.10/README.md @@ -0,0 +1,20 @@ +# 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-24.10/run_tests.sh; +``` + +Or if you want to run single test, +``` +sudo apt update +make clean; make -j +tools/pm3_tests.sh --long +``` diff --git a/docker/ubuntu-24.10/docker_conf.inc b/docker/ubuntu-24.10/docker_conf.inc new file mode 100644 index 000000000..a6c548152 --- /dev/null +++ b/docker/ubuntu-24.10/docker_conf.inc @@ -0,0 +1 @@ +DOCKER_IMAGE=pm3-ubuntu-24.10:1.0 diff --git a/docker/ubuntu-24.10/run_tests.sh b/docker/ubuntu-24.10/run_tests.sh new file mode 100755 index 000000000..3dbfac71d --- /dev/null +++ b/docker/ubuntu-24.10/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.10/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 diff --git a/docker/ubuntu-25.04/Dockerfile b/docker/ubuntu-25.04/Dockerfile new file mode 100644 index 000000000..245d7343a --- /dev/null +++ b/docker/ubuntu-25.04/Dockerfile @@ -0,0 +1,34 @@ +FROM ubuntu:25.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 --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 => 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 +# 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"] diff --git a/docker/ubuntu-25.04/README.md b/docker/ubuntu-25.04/README.md new file mode 100644 index 000000000..ae44d231a --- /dev/null +++ b/docker/ubuntu-25.04/README.md @@ -0,0 +1,20 @@ +# 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-25.04/run_tests.sh; +``` + +Or if you want to run single test, +``` +sudo apt update +make clean; make -j +tools/pm3_tests.sh --long +``` diff --git a/docker/ubuntu-25.04/docker_conf.inc b/docker/ubuntu-25.04/docker_conf.inc new file mode 100644 index 000000000..3b0c2e0e3 --- /dev/null +++ b/docker/ubuntu-25.04/docker_conf.inc @@ -0,0 +1 @@ +DOCKER_IMAGE=pm3-ubuntu-25.04:1.0 diff --git a/docker/ubuntu-25.04/run_tests.sh b/docker/ubuntu-25.04/run_tests.sh new file mode 100755 index 000000000..d65d78809 --- /dev/null +++ b/docker/ubuntu-25.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-25.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