diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile index 93584c098..18f573cb2 100644 --- a/docker/archlinux/Dockerfile +++ b/docker/archlinux/Dockerfile @@ -5,10 +5,9 @@ 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 arm-none-eabi-gcc arm-none-eabi-newlib python --needed +RUN pacman -S --noconfirm sudo git base-devel cmake libusb readline bzip2 lz4 arm-none-eabi-gcc arm-none-eabi-newlib python --needed RUN pacman -S --noconfirm python-pip -RUN python3 -m pip install ansicolors sslcrypto # OpenCL for hitag2crack RUN pacman -S --noconfirm ocl-icd diff --git a/docker/archlinux/README.md b/docker/archlinux/README.md index 872d46cb4..7c699e524 100644 --- a/docker/archlinux/README.md +++ b/docker/archlinux/README.md @@ -47,5 +47,11 @@ 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 53eeda9a3..67715f92f 100755 --- a/docker/archlinux/run_tests.sh +++ b/docker/archlinux/run_tests.sh @@ -39,4 +39,9 @@ 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/fedora-36/Dockerfile b/docker/fedora-36/Dockerfile index 007af68c3..3cb7b93c6 100644 --- a/docker/fedora-36/Dockerfile +++ b/docker/fedora-36/Dockerfile @@ -2,7 +2,7 @@ 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 bluez-libs-devel python3-devel openssl-devel libatomic findutils +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 libatomic findutils RUN yum -y update RUN yum -y install cmake python-pip diff --git a/docker/fedora-36/docker_rm.sh b/docker/fedora-36/docker_rm.sh index ea2b28809..bcdd1d060 100644 --- a/docker/fedora-36/docker_rm.sh +++ b/docker/fedora-36/docker_rm.sh @@ -1,4 +1,5 @@ #!/bin/bash +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 diff --git a/docker/fedora-37/Dockerfile b/docker/fedora-37/Dockerfile index 930767853..122834560 100644 --- a/docker/fedora-37/Dockerfile +++ b/docker/fedora-37/Dockerfile @@ -2,7 +2,7 @@ FROM fedora:37 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 bluez-libs-devel python3-devel openssl-devel libatomic findutils +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 libatomic findutils RUN yum -y update RUN yum -y install cmake python-pip diff --git a/docker/fedora-37/docker_rm.sh b/docker/fedora-37/docker_rm.sh index a9359d0fd..896b5ac82 100644 --- a/docker/fedora-37/docker_rm.sh +++ b/docker/fedora-37/docker_rm.sh @@ -1,4 +1,5 @@ #!/bin/bash +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