fix archlinux and fedora dockers

This commit is contained in:
Philippe Teuwen 2023-07-16 17:25:43 +02:00
commit a54097e19c
7 changed files with 16 additions and 4 deletions

View file

@ -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

View file

@ -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
```

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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