diff --git a/docker/archlinux/docker_rm.sh b/docker/archlinux/docker_rm.sh index b4d9e7738..0c2d24f4e 100644 --- a/docker/archlinux/docker_rm.sh +++ b/docker/archlinux/docker_rm.sh @@ -1,6 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-arch:1.0) docker image rm pm3-arch:1.0 -docker image rm archlinux:base -# old ref: -docker image rm archlinux/base diff --git a/docker/build-all.sh b/docker/build-all.sh index aba45382f..ed56a0972 100755 --- a/docker/build-all.sh +++ b/docker/build-all.sh @@ -1,5 +1,5 @@ #!/bin/bash -for os in archlinux debian-buster fedora-36 fedora-37 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-18.04 ubuntu-20.04 ubuntu-22.04; do +for os in archlinux debian-12-bookworm fedora-36 fedora-37 homebrew kali opensuse-leap opensuse-tumbleweed parrot-core-latest ubuntu-20.04 ubuntu-22.04; do ( cd $os && ./docker_build.sh ) done diff --git a/docker/debian-bullseye/Dockerfile b/docker/debian-11-bullseye/Dockerfile similarity index 100% rename from docker/debian-bullseye/Dockerfile rename to docker/debian-11-bullseye/Dockerfile diff --git a/docker/debian-bullseye/README.md b/docker/debian-11-bullseye/README.md similarity index 91% rename from docker/debian-bullseye/README.md rename to docker/debian-11-bullseye/README.md index e86881019..3a7775b7c 100644 --- a/docker/debian-bullseye/README.md +++ b/docker/debian-11-bullseye/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/debian-bullseye/run_tests.sh; +docker/debian-11-bullseye/run_tests.sh; ``` Or if you want to run single test, diff --git a/docker/debian-bullseye/docker_build.sh b/docker/debian-11-bullseye/docker_build.sh similarity index 100% rename from docker/debian-bullseye/docker_build.sh rename to docker/debian-11-bullseye/docker_build.sh diff --git a/docker/debian-11-bullseye/docker_rm.sh b/docker/debian-11-bullseye/docker_rm.sh new file mode 100644 index 000000000..b8ce5b834 --- /dev/null +++ b/docker/debian-11-bullseye/docker_rm.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +docker rm $(docker ps -aq --filter ancestor=pm3-debian-bullseye:1.0) +docker image rm pm3-debian-bullseye:1.0 diff --git a/docker/debian-bullseye/docker_run.sh b/docker/debian-11-bullseye/docker_run.sh similarity index 100% rename from docker/debian-bullseye/docker_run.sh rename to docker/debian-11-bullseye/docker_run.sh diff --git a/docker/debian-bullseye/run_tests.sh b/docker/debian-11-bullseye/run_tests.sh similarity index 80% rename from docker/debian-bullseye/run_tests.sh rename to docker/debian-11-bullseye/run_tests.sh index 25e6d2a21..9c7128942 100755 --- a/docker/debian-bullseye/run_tests.sh +++ b/docker/debian-11-bullseye/run_tests.sh @@ -2,7 +2,7 @@ # Iceman 2022 # # This script is to be run from proxmark root folder inside the docker env -# docker/debian-bullseye/run_tests.sh; +# docker/debian-11-bullseye/run_tests.sh; sudo apt update && sudo apt upgrade -y tools/release_tests.sh diff --git a/docker/debian-12-bookworm/Dockerfile b/docker/debian-12-bookworm/Dockerfile new file mode 100644 index 000000000..92527289c --- /dev/null +++ b/docker/debian-12-bookworm/Dockerfile @@ -0,0 +1,26 @@ +FROM debian:bookworm-slim + +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 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 +RUN useradd -ms /bin/bash rrg +RUN passwd -d rrg +RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers + +USER rrg +WORKDIR "/home/rrg" + +CMD ["/bin/bash"] diff --git a/docker/debian-12-bookworm/README.md b/docker/debian-12-bookworm/README.md new file mode 100644 index 000000000..67c0f6a8b --- /dev/null +++ b/docker/debian-12-bookworm/README.md @@ -0,0 +1,26 @@ +# 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-12-bookworm/run_tests.sh; +``` + +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/docker_build.sh b/docker/debian-12-bookworm/docker_build.sh new file mode 100755 index 000000000..0059348cf --- /dev/null +++ b/docker/debian-12-bookworm/docker_build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker build -t "pm3-debian-bookworm:1.0" . diff --git a/docker/debian-12-bookworm/docker_rm.sh b/docker/debian-12-bookworm/docker_rm.sh new file mode 100644 index 000000000..5818564e0 --- /dev/null +++ b/docker/debian-12-bookworm/docker_rm.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +docker rm $(docker ps -aq --filter ancestor=pm3-debian-bookworm:1.0) +docker image rm pm3-debian-bookworm:1.0 diff --git a/docker/debian-12-bookworm/docker_run.sh b/docker/debian-12-bookworm/docker_run.sh new file mode 100755 index 000000000..ae264581a --- /dev/null +++ b/docker/debian-12-bookworm/docker_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-debian-bookworm:1.0 diff --git a/docker/debian-12-bookworm/run_tests.sh b/docker/debian-12-bookworm/run_tests.sh new file mode 100755 index 000000000..06837fc99 --- /dev/null +++ b/docker/debian-12-bookworm/run_tests.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# This script is to be run from proxmark root folder inside the docker env +# 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 new file mode 100644 index 000000000..c64707ceb --- /dev/null +++ b/docker/debian-13-trixie/Dockerfile @@ -0,0 +1,26 @@ +FROM debian:trixie-slim + +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 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 +RUN useradd -ms /bin/bash rrg +RUN passwd -d rrg +RUN printf 'rrg ALL=(ALL) ALL\n' | tee -a /etc/sudoers + +USER rrg +WORKDIR "/home/rrg" + +CMD ["/bin/bash"] diff --git a/docker/debian-13-trixie/README.md b/docker/debian-13-trixie/README.md new file mode 100644 index 000000000..53d448546 --- /dev/null +++ b/docker/debian-13-trixie/README.md @@ -0,0 +1,26 @@ +# 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-13-trixie/run_tests.sh; +``` + +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/docker_build.sh b/docker/debian-13-trixie/docker_build.sh new file mode 100755 index 000000000..22a5bdbc3 --- /dev/null +++ b/docker/debian-13-trixie/docker_build.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker build -t "pm3-debian-trixie:1.0" . diff --git a/docker/debian-13-trixie/docker_rm.sh b/docker/debian-13-trixie/docker_rm.sh new file mode 100644 index 000000000..0afb68014 --- /dev/null +++ b/docker/debian-13-trixie/docker_rm.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +docker rm $(docker ps -aq --filter ancestor=pm3-debian-trixie:1.0) +docker image rm pm3-debian-trixie:1.0 diff --git a/docker/debian-13-trixie/docker_run.sh b/docker/debian-13-trixie/docker_run.sh new file mode 100755 index 000000000..bc81286fc --- /dev/null +++ b/docker/debian-13-trixie/docker_run.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-debian-trixie:1.0 diff --git a/docker/debian-13-trixie/run_tests.sh b/docker/debian-13-trixie/run_tests.sh new file mode 100755 index 000000000..dc76107e4 --- /dev/null +++ b/docker/debian-13-trixie/run_tests.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# 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-bullseye/docker_rm.sh b/docker/debian-bullseye/docker_rm.sh deleted file mode 100644 index d9609e2dd..000000000 --- a/docker/debian-bullseye/docker_rm.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -docker image rm pm3-debian-bullseye:1.0 -docker image rm bullseye-slim diff --git a/docker/fedora-36/docker_rm.sh b/docker/fedora-36/docker_rm.sh index bcdd1d060..a14c31e80 100644 --- a/docker/fedora-36/docker_rm.sh +++ b/docker/fedora-36/docker_rm.sh @@ -2,4 +2,3 @@ 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/docker_rm.sh b/docker/fedora-37/docker_rm.sh index 896b5ac82..6f0bd7e56 100644 --- a/docker/fedora-37/docker_rm.sh +++ b/docker/fedora-37/docker_rm.sh @@ -2,4 +2,3 @@ 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 diff --git a/docker/homebrew/docker_rm.sh b/docker/homebrew/docker_rm.sh index 717156495..aa782d4a3 100644 --- a/docker/homebrew/docker_rm.sh +++ b/docker/homebrew/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-brew:1.0) docker image rm pm3-brew:1.0 -docker image rm homebrew/brew diff --git a/docker/kali/docker_rm.sh b/docker/kali/docker_rm.sh index 4cc73265d..fee4f07cf 100644 --- a/docker/kali/docker_rm.sh +++ b/docker/kali/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-kali:1.0) docker image rm pm3-kali:1.0 -#docker image rm kalilinux/kali-rolling diff --git a/docker/opensuse-leap/docker_rm.sh b/docker/opensuse-leap/docker_rm.sh index 9f120b8e1..12302b6f7 100644 --- a/docker/opensuse-leap/docker_rm.sh +++ b/docker/opensuse-leap/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-suse-leap:1.0) docker image rm pm3-suse-leap:1.0 -docker image rm opensuse/leap diff --git a/docker/opensuse-tumbleweed/docker_rm.sh b/docker/opensuse-tumbleweed/docker_rm.sh index f4d019f2b..c4b1b1d53 100644 --- a/docker/opensuse-tumbleweed/docker_rm.sh +++ b/docker/opensuse-tumbleweed/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-suse-tumbleweed:1.0) docker image rm pm3-suse-tumbleweed:1.0 -docker image rm opensuse/tumbleweed diff --git a/docker/parrot-core-latest/docker_rm.sh b/docker/parrot-core-latest/docker_rm.sh index 4874bdec5..9bf1605e5 100644 --- a/docker/parrot-core-latest/docker_rm.sh +++ b/docker/parrot-core-latest/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-parrotsec-core-latest:1.0) docker image rm pm3-parrotsec-core-latest:1.0 -docker image rm parrotsec/core:latest diff --git a/docker/ubuntu-18.04/docker_rm.sh b/docker/ubuntu-18.04/docker_rm.sh index c566f0e8d..20dcb80b2 100644 --- a/docker/ubuntu-18.04/docker_rm.sh +++ b/docker/ubuntu-18.04/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-18.04:1.0) docker image rm pm3-ubuntu-18.04:1.0 -docker image rm ubuntu:18.04 diff --git a/docker/ubuntu-20.04/docker_rm.sh b/docker/ubuntu-20.04/docker_rm.sh index 37b6fd8b2..d71954339 100644 --- a/docker/ubuntu-20.04/docker_rm.sh +++ b/docker/ubuntu-20.04/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-20.04:1.0) docker image rm pm3-ubuntu-20.04:1.0 -docker image rm ubuntu:20.04 diff --git a/docker/ubuntu-22.04/docker_rm.sh b/docker/ubuntu-22.04/docker_rm.sh index e6a5f0302..d1b82948b 100644 --- a/docker/ubuntu-22.04/docker_rm.sh +++ b/docker/ubuntu-22.04/docker_rm.sh @@ -1,4 +1,4 @@ #!/bin/bash +docker rm $(docker ps -aq --filter ancestor=pm3-ubuntu-22.04:1.0) docker image rm pm3-ubuntu-22.04:1.0 -docker image rm ubuntu:22.04