diff --git a/docker/debian-11-bullseye/README.md b/docker/debian-11-bullseye/README.md deleted file mode 100644 index 3a7775b7c..000000000 --- a/docker/debian-11-bullseye/README.md +++ /dev/null @@ -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 -``` diff --git a/docker/debian-11-bullseye/docker_conf.inc b/docker/debian-11-bullseye/docker_conf.inc deleted file mode 100644 index 030a408d0..000000000 --- a/docker/debian-11-bullseye/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-debian-bullseye:1.0 diff --git a/docker/debian-11-bullseye/run_tests.sh b/docker/debian-11-bullseye/run_tests.sh deleted file mode 100755 index 9c7128942..000000000 --- a/docker/debian-11-bullseye/run_tests.sh +++ /dev/null @@ -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 diff --git a/docker/fedora-36/Dockerfile b/docker/fedora-36/Dockerfile deleted file mode 100644 index 1041b799a..000000000 --- a/docker/fedora-36/Dockerfile +++ /dev/null @@ -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"] diff --git a/docker/fedora-36/README.md b/docker/fedora-36/README.md deleted file mode 100644 index 6648fb28d..000000000 --- a/docker/fedora-36/README.md +++ /dev/null @@ -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 -``` diff --git a/docker/fedora-36/docker_conf.inc b/docker/fedora-36/docker_conf.inc deleted file mode 100644 index de95aa9d4..000000000 --- a/docker/fedora-36/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-fedora-36:1.0 diff --git a/docker/fedora-37/docker_conf.inc b/docker/fedora-37/docker_conf.inc deleted file mode 100644 index 6fbdd2474..000000000 --- a/docker/fedora-37/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-fedora-37:1.0 diff --git a/docker/fedora-37/run_tests.sh b/docker/fedora-37/run_tests.sh deleted file mode 100755 index 05cdb7da8..000000000 --- a/docker/fedora-37/run_tests.sh +++ /dev/null @@ -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 diff --git a/docker/fedora-37/Dockerfile b/docker/fedora-41/Dockerfile similarity index 98% rename from docker/fedora-37/Dockerfile rename to docker/fedora-41/Dockerfile index bb3118fd2..959922831 100644 --- a/docker/fedora-37/Dockerfile +++ b/docker/fedora-41/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:37 +FROM fedora:41 ENV LANG=C # qt5-qtbase-devel skipped diff --git a/docker/fedora-37/README.md b/docker/fedora-41/README.md similarity index 93% rename from docker/fedora-37/README.md rename to docker/fedora-41/README.md index 79c88e040..2c1d28040 100644 --- a/docker/fedora-37/README.md +++ b/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, diff --git a/docker/fedora-41/docker_conf.inc b/docker/fedora-41/docker_conf.inc new file mode 100644 index 000000000..eb8968f1c --- /dev/null +++ b/docker/fedora-41/docker_conf.inc @@ -0,0 +1 @@ +DOCKER_IMAGE=pm3-fedora-41:1.0 diff --git a/docker/fedora-36/run_tests.sh b/docker/fedora-41/run_tests.sh similarity index 82% rename from docker/fedora-36/run_tests.sh rename to docker/fedora-41/run_tests.sh index 05cdb7da8..b97b86afe 100755 --- a/docker/fedora-36/run_tests.sh +++ b/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 diff --git a/docker/ubuntu-18.04/Dockerfile b/docker/ubuntu-18.04/Dockerfile deleted file mode 100644 index f287c344e..000000000 --- a/docker/ubuntu-18.04/Dockerfile +++ /dev/null @@ -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"] diff --git a/docker/ubuntu-18.04/README.md b/docker/ubuntu-18.04/README.md deleted file mode 100644 index 6cc3b9ef2..000000000 --- a/docker/ubuntu-18.04/README.md +++ /dev/null @@ -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 -``` diff --git a/docker/ubuntu-18.04/docker_conf.inc b/docker/ubuntu-18.04/docker_conf.inc deleted file mode 100644 index 4a5a20a2e..000000000 --- a/docker/ubuntu-18.04/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-ubuntu-18.04:1.0 diff --git a/docker/ubuntu-18.04/run_tests.sh b/docker/ubuntu-18.04/run_tests.sh deleted file mode 100755 index 1efdbc060..000000000 --- a/docker/ubuntu-18.04/run_tests.sh +++ /dev/null @@ -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 diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile deleted file mode 100644 index c02544234..000000000 --- a/docker/ubuntu-20.04/Dockerfile +++ /dev/null @@ -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"] diff --git a/docker/ubuntu-20.04/README.md b/docker/ubuntu-20.04/README.md deleted file mode 100644 index 4c432eff1..000000000 --- a/docker/ubuntu-20.04/README.md +++ /dev/null @@ -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 -``` diff --git a/docker/ubuntu-20.04/docker_conf.inc b/docker/ubuntu-20.04/docker_conf.inc deleted file mode 100644 index 601a7b7b2..000000000 --- a/docker/ubuntu-20.04/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-ubuntu-20.04:1.0 diff --git a/docker/ubuntu-20.04/run_tests.sh b/docker/ubuntu-20.04/run_tests.sh deleted file mode 100755 index aa98bc327..000000000 --- a/docker/ubuntu-20.04/run_tests.sh +++ /dev/null @@ -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 diff --git a/docker/ubuntu-22.04/Dockerfile b/docker/ubuntu-22.04/Dockerfile deleted file mode 100644 index d182d893e..000000000 --- a/docker/ubuntu-22.04/Dockerfile +++ /dev/null @@ -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"] diff --git a/docker/ubuntu-22.04/docker_conf.inc b/docker/ubuntu-22.04/docker_conf.inc deleted file mode 100644 index 7c5a79adb..000000000 --- a/docker/ubuntu-22.04/docker_conf.inc +++ /dev/null @@ -1 +0,0 @@ -DOCKER_IMAGE=pm3-ubuntu-22.04:1.0 diff --git a/docker/ubuntu-22.04/run_tests.sh b/docker/ubuntu-22.04/run_tests.sh deleted file mode 100755 index 4f8ce55ea..000000000 --- a/docker/ubuntu-22.04/run_tests.sh +++ /dev/null @@ -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 diff --git a/docker/debian-11-bullseye/Dockerfile b/docker/ubuntu-24.04/Dockerfile similarity index 75% rename from docker/debian-11-bullseye/Dockerfile rename to docker/ubuntu-24.04/Dockerfile index c32710dda..0932f8e4f 100644 --- a/docker/debian-11-bullseye/Dockerfile +++ b/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 && \ - apt-get install -y python3-pip && \ - apt-get clean && \ - python3 -m pip install ansicolors sslcrypto +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 +# 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 diff --git a/docker/ubuntu-22.04/README.md b/docker/ubuntu-24.04/README.md similarity index 92% rename from docker/ubuntu-22.04/README.md rename to docker/ubuntu-24.04/README.md index 93d4462ad..24a2605a1 100644 --- a/docker/ubuntu-22.04/README.md +++ b/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, diff --git a/docker/ubuntu-24.04/docker_conf.inc b/docker/ubuntu-24.04/docker_conf.inc new file mode 100644 index 000000000..38c37aff7 --- /dev/null +++ b/docker/ubuntu-24.04/docker_conf.inc @@ -0,0 +1 @@ +DOCKER_IMAGE=pm3-ubuntu-24.04:1.0 diff --git a/docker/ubuntu-24.04/run_tests.sh b/docker/ubuntu-24.04/run_tests.sh new file mode 100755 index 000000000..f77f54baf --- /dev/null +++ b/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