diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 900b9d04c..caaa2bc89 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -5,9 +5,7 @@ RUN pacman -Syu --noconfirm RUN pacman-db-upgrade # qt5-base skipped # bluez skipped, can't be installed in docker -RUN pacman -S --noconfirm sudo git base-devel cmake libusb readline bzip2 lz4 gd arm-none-eabi-gcc arm-none-eabi-newlib python --needed - -RUN pacman -S --noconfirm python-pip +RUN pacman -S --noconfirm sudo git base-devel cmake libusb readline bzip2 lz4 gd arm-none-eabi-gcc arm-none-eabi-newlib --needed # OpenCL for hitag2crack RUN pacman -S --noconfirm ocl-icd @@ -23,6 +21,9 @@ RUN if [ -n "${UART_GID}" ]; then \ fi RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + USER rrg WORKDIR "/home/rrg" diff --git a/docker/archlinux/README.md b/docker/archlinux/README.md index 7c699e524..f025c6b17 100644 --- a/docker/archlinux/README.md +++ b/docker/archlinux/README.md @@ -48,10 +48,5 @@ Or if you want to run single test, ``` 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 ``` diff --git a/docker/archlinux/run_tests.sh b/docker/archlinux/run_tests.sh index 67715f92f..53eeda9a3 100755 --- a/docker/archlinux/run_tests.sh +++ b/docker/archlinux/run_tests.sh @@ -39,9 +39,4 @@ pacman -Ss '^gcc$' # sudo pacman -S testing/gcc # sudo pacman -S gcc -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/debian-12-bookworm-arm64/Dockerfile b/docker/debian-12-bookworm-arm64/Dockerfile index 792014812..fe53fe4ef 100644 --- a/docker/debian-12-bookworm-arm64/Dockerfile +++ b/docker/debian-12-bookworm-arm64/Dockerfile @@ -8,6 +8,9 @@ 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 +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/debian-12-bookworm-arm64/README.md b/docker/debian-12-bookworm-arm64/README.md index 2ffa42d1a..e7a75ebe0 100644 --- a/docker/debian-12-bookworm-arm64/README.md +++ b/docker/debian-12-bookworm-arm64/README.md @@ -2,13 +2,6 @@ ``` sudo apt update -sudo apt install -y python3-minimal -sudo apt install -y python3-pip -sudo apt install python3.11-venv -python3 -m venv /tmp/venv -source /tmp/venv/bin/activate -python3 -m pip install --use-pep517 pyaes -python3 -m pip install ansicolors sslcrypto git config --global --add safe.directory /home/rrg/proxmark3 cd proxmark3 make clean diff --git a/docker/debian-12-bookworm-armhf/Dockerfile b/docker/debian-12-bookworm-armhf/Dockerfile index e5d5acf2b..c7e4cac70 100644 --- a/docker/debian-12-bookworm-armhf/Dockerfile +++ b/docker/debian-12-bookworm-armhf/Dockerfile @@ -8,6 +8,9 @@ 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 +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/debian-12-bookworm-armhf/README.md b/docker/debian-12-bookworm-armhf/README.md index 2ffa42d1a..e7a75ebe0 100644 --- a/docker/debian-12-bookworm-armhf/README.md +++ b/docker/debian-12-bookworm-armhf/README.md @@ -2,13 +2,6 @@ ``` sudo apt update -sudo apt install -y python3-minimal -sudo apt install -y python3-pip -sudo apt install python3.11-venv -python3 -m venv /tmp/venv -source /tmp/venv/bin/activate -python3 -m pip install --use-pep517 pyaes -python3 -m pip install ansicolors sslcrypto git config --global --add safe.directory /home/rrg/proxmark3 cd proxmark3 make clean diff --git a/docker/debian-12-bookworm/Dockerfile b/docker/debian-12-bookworm/Dockerfile index 6c883746d..cbe37c399 100644 --- a/docker/debian-12-bookworm/Dockerfile +++ b/docker/debian-12-bookworm/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/debian-12-bookworm/README.md b/docker/debian-12-bookworm/README.md index 67c0f6a8b..ebc520540 100644 --- a/docker/debian-12-bookworm/README.md +++ b/docker/debian-12-bookworm/README.md @@ -17,10 +17,5 @@ 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 ``` diff --git a/docker/debian-12-bookworm/run_tests.sh b/docker/debian-12-bookworm/run_tests.sh index 06837fc99..d9fbcf8d2 100755 --- a/docker/debian-12-bookworm/run_tests.sh +++ b/docker/debian-12-bookworm/run_tests.sh @@ -3,9 +3,4 @@ # 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 diff --git a/docker/debian-13-trixie/Dockerfile b/docker/debian-13-trixie/Dockerfile index 607c5bba5..38513db23 100644 --- a/docker/debian-13-trixie/Dockerfile +++ b/docker/debian-13-trixie/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/debian-13-trixie/README.md b/docker/debian-13-trixie/README.md index 53d448546..03d39cb83 100644 --- a/docker/debian-13-trixie/README.md +++ b/docker/debian-13-trixie/README.md @@ -17,10 +17,5 @@ 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 ``` diff --git a/docker/debian-13-trixie/run_tests.sh b/docker/debian-13-trixie/run_tests.sh index dc76107e4..b63c475b9 100755 --- a/docker/debian-13-trixie/run_tests.sh +++ b/docker/debian-13-trixie/run_tests.sh @@ -2,10 +2,4 @@ # 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 diff --git a/docker/debian-14-forky/README.md b/docker/debian-14-forky/README.md index d35a39cfa..22b373f26 100644 --- a/docker/debian-14-forky/README.md +++ b/docker/debian-14-forky/README.md @@ -17,10 +17,5 @@ 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 ``` diff --git a/docker/debian-14-forky/run_tests.sh b/docker/debian-14-forky/run_tests.sh index 8124538fe..24913d675 100755 --- a/docker/debian-14-forky/run_tests.sh +++ b/docker/debian-14-forky/run_tests.sh @@ -3,9 +3,4 @@ # docker/debian-14-forky/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/fedora-41/Dockerfile b/docker/fedora-41/Dockerfile index 959922831..c64b5646f 100644 --- a/docker/fedora-41/Dockerfile +++ b/docker/fedora-41/Dockerfile @@ -2,14 +2,15 @@ FROM fedora:41 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 dnf install -y passwd sudo git make cmake 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 +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/fedora-42/Dockerfile b/docker/fedora-42/Dockerfile index 181ac02a3..75516752c 100644 --- a/docker/fedora-42/Dockerfile +++ b/docker/fedora-42/Dockerfile @@ -2,14 +2,15 @@ FROM fedora:42 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 dnf install -y passwd sudo git make cmake 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 +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/fedora-42/run_tests.sh b/docker/fedora-42/run_tests.sh index f94642645..87f35a9b4 100755 --- a/docker/fedora-42/run_tests.sh +++ b/docker/fedora-42/run_tests.sh @@ -5,9 +5,4 @@ # 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/Dockerfile b/docker/fedora-43/Dockerfile index 1c8affc51..43995fe51 100644 --- a/docker/fedora-43/Dockerfile +++ b/docker/fedora-43/Dockerfile @@ -2,14 +2,15 @@ FROM fedora:rawhide 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 dnf install -y passwd sudo git make cmake 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 +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/fedora-43/run_tests.sh b/docker/fedora-43/run_tests.sh index f73e5fb62..c74e26801 100755 --- a/docker/fedora-43/run_tests.sh +++ b/docker/fedora-43/run_tests.sh @@ -5,9 +5,4 @@ # 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/kali/Dockerfile b/docker/kali/Dockerfile index 90349c69d..c81861a1f 100644 --- a/docker/kali/Dockerfile +++ b/docker/kali/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/kali/run_tests.sh b/docker/kali/run_tests.sh index 3fc747191..dec20763b 100755 --- a/docker/kali/run_tests.sh +++ b/docker/kali/run_tests.sh @@ -5,9 +5,4 @@ # docker/kali/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/opensuse-leap/Dockerfile b/docker/opensuse-leap/Dockerfile index 701ac8505..ce8c855b7 100644 --- a/docker/opensuse-leap/Dockerfile +++ b/docker/opensuse-leap/Dockerfile @@ -2,17 +2,17 @@ FROM opensuse/leap ENV LANG=C # libqt5-qtbase-devel skipped -RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel gd-devel +RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis cmake gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel gd-devel RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/15.6/home:wkazubski.repo && \ zypper --gpg-auto-import-keys refresh && \ zypper --non-interactive install cross-arm-none-eabi-gcc14 cross-arm-none-eabi-newlib -RUN zypper --non-interactive install cmake python3 python3-pip && \ - python3 -m pip install ansicolors sslcrypto - RUN zypper --non-interactive install ocl-icd-devel +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/opensuse-tumbleweed/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile index 7bc086b29..92bab3394 100644 --- a/docker/opensuse-tumbleweed/Dockerfile +++ b/docker/opensuse-tumbleweed/Dockerfile @@ -2,16 +2,17 @@ FROM opensuse/tumbleweed ENV LANG=C # libqt5-qtbase-devel skipped -RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc14 cross-arm-none-newlib-devel gd-devel +RUN zypper --non-interactive install --no-recommends shadow sudo git patterns-devel-base-devel_basis cmake gcc-c++ readline-devel libbz2-devel liblz4-devel bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc14 cross-arm-none-newlib-devel gd-devel #RUN zypper addrepo https://download.opensuse.org/repositories/home:wkazubski/openSUSE_Tumbleweed/home:wkazubski.repo && \ # zypper --gpg-auto-import-keys refresh && \ # zypper --non-interactive install cross-arm-none-eabi-gcc12 cross-arm-none-eabi-newlib -RUN zypper --non-interactive install cmake python311 python311-pip python311-virtualenv - RUN zypper --non-interactive install ocl-icd-devel +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/opensuse-tumbleweed/README.md b/docker/opensuse-tumbleweed/README.md index 282d3f4f7..bd55e0c9d 100644 --- a/docker/opensuse-tumbleweed/README.md +++ b/docker/opensuse-tumbleweed/README.md @@ -16,10 +16,5 @@ Or if you want to run single test, ``` sudo zypper refresh && sudo zypper --non-interactive 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 ``` diff --git a/docker/opensuse-tumbleweed/run_tests.sh b/docker/opensuse-tumbleweed/run_tests.sh index bb613ffc0..9002131e9 100755 --- a/docker/opensuse-tumbleweed/run_tests.sh +++ b/docker/opensuse-tumbleweed/run_tests.sh @@ -5,9 +5,4 @@ # docker/opensuse-tumbleweed/run_tests.sh; sudo zypper refresh && sudo zypper --non-interactive 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/parrot-core-latest/Dockerfile b/docker/parrot-core-latest/Dockerfile index 044acdff4..29faa61ae 100644 --- a/docker/parrot-core-latest/Dockerfile +++ b/docker/parrot-core-latest/Dockerfile @@ -9,12 +9,12 @@ 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 python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # Create rrg user RUN useradd -ms /bin/bash rrg RUN passwd -d rrg diff --git a/docker/parrot-core-latest/run_tests.sh b/docker/parrot-core-latest/run_tests.sh index 01fb172ac..65b0737c4 100755 --- a/docker/parrot-core-latest/run_tests.sh +++ b/docker/parrot-core-latest/run_tests.sh @@ -5,8 +5,4 @@ # docker/parrot-core-latest/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 diff --git a/docker/ubuntu-24.04/Dockerfile b/docker/ubuntu-24.04/Dockerfile index 0932f8e4f..de35f65f3 100644 --- a/docker/ubuntu-24.04/Dockerfile +++ b/docker/ubuntu-24.04/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # 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 diff --git a/docker/ubuntu-24.04/run_tests.sh b/docker/ubuntu-24.04/run_tests.sh index f77f54baf..532337522 100755 --- a/docker/ubuntu-24.04/run_tests.sh +++ b/docker/ubuntu-24.04/run_tests.sh @@ -5,9 +5,4 @@ # 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 diff --git a/docker/ubuntu-24.10/Dockerfile b/docker/ubuntu-24.10/Dockerfile index 89abd2516..87c0a873e 100644 --- a/docker/ubuntu-24.10/Dockerfile +++ b/docker/ubuntu-24.10/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # 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 diff --git a/docker/ubuntu-24.10/run_tests.sh b/docker/ubuntu-24.10/run_tests.sh index 3dbfac71d..c318be0f7 100755 --- a/docker/ubuntu-24.10/run_tests.sh +++ b/docker/ubuntu-24.10/run_tests.sh @@ -5,9 +5,4 @@ # 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 index 245d7343a..e5153fbee 100644 --- a/docker/ubuntu-25.04/Dockerfile +++ b/docker/ubuntu-25.04/Dockerfile @@ -9,12 +9,12 @@ 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 --no-install-recommends python3-minimal python3-pip python3-venv && \ - apt-get clean - RUN apt-get install -y opencl-dev && \ apt-get clean +# uv +COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ + # 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 diff --git a/docker/ubuntu-25.04/run_tests.sh b/docker/ubuntu-25.04/run_tests.sh index d65d78809..046de2ba0 100755 --- a/docker/ubuntu-25.04/run_tests.sh +++ b/docker/ubuntu-25.04/run_tests.sh @@ -5,9 +5,4 @@ # 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 diff --git a/tools/pm3_tests.sh b/tools/pm3_tests.sh index 4d3f35040..265e0aa7f 100755 --- a/tools/pm3_tests.sh +++ b/tools/pm3_tests.sh @@ -6,6 +6,11 @@ LANG=C PM3PATH="$(dirname "$0")/.." cd "$PM3PATH" || exit 1 +PYTHON=python3 +if command -v uv >/dev/null 2>&1; then + PYTHON="uv run --script" +fi + DICPATH="./client/dictionaries" RESOURCEPATH="./client/resources" @@ -279,11 +284,11 @@ while true; do if ! CheckFileExist "HITAG2 dictionary exists" "$DICPATH/ht2_default.dic"; then break; fi echo -e "\n${C_BLUE}Testing tools:${C_NC}" - if ! CheckExecute "xorcheck test" "tools/xorcheck.py 04 00 80 64 ba" "final LRC XOR byte value: 5A"; then break; fi - if ! CheckExecute "findbits test" "tools/findbits.py 73 0110010101110011" "Match at bit 9: 011001010"; then break; fi - if ! CheckExecute "findbits_test test" "tools/findbits_test.py 2>&1" "OK"; then break; fi - if ! CheckExecute "pm3_eml_mfd test" "tools/mfc/pm3_eml_mfd_test.py 2>&1" "OK"; then break; fi - if ! CheckExecute "recover_pk test" "tools/recover_pk.py selftests 2>&1" "Tests:.*\(.*ok.*"; then break; fi + if ! CheckExecute "xorcheck test" "$PYTHON tools/xorcheck.py 04 00 80 64 ba" "final LRC XOR byte value: 5A"; then break; fi + if ! CheckExecute "findbits test" "$PYTHON tools/findbits.py 73 0110010101110011" "Match at bit 9: 011001010"; then break; fi + if ! CheckExecute "findbits_test test" "$PYTHON tools/findbits_test.py 2>&1" "OK"; then break; fi + if ! CheckExecute "pm3_eml_mfd test" "$PYTHON tools/mfc/pm3_eml_mfd_test.py 2>&1" "OK"; then break; fi + if ! CheckExecute "recover_pk test" "$PYTHON tools/recover_pk.py selftests 2>&1" "Tests:.*\(.*ok.*"; then break; fi if ! CheckExecute "mkversion create test" "tools/mkversion.sh --short" 'Iceman/'; then break; fi fi if $TESTALL || $TESTBOOTROM; then @@ -372,7 +377,7 @@ while true; do HT2CRACK3KEY=000102030405 HT2CRACK3N=32 HT2CRACK3NRAR=hitag2_${HT2CRACK3UID}_nrar_${HT2CRACK3N}emul.txt - if ! CheckExecute "ht2crack3 gen testfile" "cd $HT2CRACK3PATH; python3 ../hitag2_gen_nRaR.py $HT2CRACK3KEY $HT2CRACK3UID $HT2CRACK3N > $HT2CRACK3NRAR && echo SUCCESS" "SUCCESS"; then break; fi + if ! CheckExecute "ht2crack3 gen testfile" "cd $HT2CRACK3PATH; $PYTHON ../hitag2_gen_nRaR.py $HT2CRACK3KEY $HT2CRACK3UID $HT2CRACK3N > $HT2CRACK3NRAR && echo SUCCESS" "SUCCESS"; then break; fi if ! CheckExecute "ht2crack3test test" "cd $HT2CRACK3PATH; ./ht2crack3test $HT2CRACK3NRAR $HT2CRACK3KEY $HT2CRACK3UID|grep -v SUCCESS||echo SUCCESS" "SUCCESS"; then break; fi if ! CheckExecute "ht2crack3 test" "cd $HT2CRACK3PATH; ./ht2crack3 $HT2CRACK3UID $HT2CRACK3NRAR |grep -E -v '(trying|partial)'" "key = $HT2CRACK3KEY"; then break; fi if ! CheckExecute "ht2crack3 rm testfile" "cd $HT2CRACK3PATH; rm $HT2CRACK3NRAR && echo SUCCESS" "SUCCESS"; then break; fi @@ -386,7 +391,7 @@ while true; do # The success is probabilistic: a fresh random nRaR file is required for each run # Order of magnitude to crack it: ~15s -> tagged as "slow" if ! CheckExecute slow retry ignore "ht2crack4 test" "cd $HT2CRACK4PATH; \ - python3 ../hitag2_gen_nRaR.py $HT2CRACK4KEY $HT2CRACK4UID $HT2CRACK4N > $HT2CRACK4NRAR; \ + $PYTHON ../hitag2_gen_nRaR.py $HT2CRACK4KEY $HT2CRACK4UID $HT2CRACK4N > $HT2CRACK4NRAR; \ ./ht2crack4 -u $HT2CRACK4UID -n $HT2CRACK4NRAR -N 16 -t 500000 2>&1; \ rm $HT2CRACK4NRAR" "key = $HT2CRACK4KEY"; then break; fi diff --git a/tools/recover_pk.py b/tools/recover_pk.py index 9cf5c626c..ff1ca2692 100755 --- a/tools/recover_pk.py +++ b/tools/recover_pk.py @@ -1,4 +1,13 @@ #!/usr/bin/env python3 +# +# /// script +# requires-python = ">=3.9" +# dependencies = [ +# "ansicolors", +# "sslcrypto", +# ] +# /// + # MIT License # Copyright (c) 2020 @doegox