From ecc425683bb7f1f1ab6cad0c7d8a5e1be93adfdc Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Sat, 29 Oct 2022 00:38:48 +0200 Subject: [PATCH] adapt docker opensuse-tumbleweed --- docker/opensuse-tumbleweed/Dockerfile | 3 +++ docker/opensuse-tumbleweed/README.md | 5 +---- docker/opensuse-tumbleweed/docker_run.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/opensuse-tumbleweed/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile index 007f98455..5d4adbb8b 100644 --- a/docker/opensuse-tumbleweed/Dockerfile +++ b/docker/opensuse-tumbleweed/Dockerfile @@ -4,6 +4,9 @@ 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 bluez-devel python3-devel libopenssl-devel cross-arm-none-gcc11 cross-arm-none-newlib-devel +RUN zypper --non-interactive install cmake python3 python3-pip +RUN python3 -m pip install ansicolors sslcrypto + # 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 b1456b1bb..00af06436 100644 --- a/docker/opensuse-tumbleweed/README.md +++ b/docker/opensuse-tumbleweed/README.md @@ -1,9 +1,6 @@ # Notes to run tests ``` -sudo zypper --non-interactive install cmake -sudo zypper --non-interactive install python3 -sudo zypper --non-interactive install python3-pip -python3 -m pip install ansicolors sslcrypto +make clean; make -j tools/pm3_tests.sh --long ``` diff --git a/docker/opensuse-tumbleweed/docker_run.sh b/docker/opensuse-tumbleweed/docker_run.sh index 047afd9b7..79ef74d5c 100755 --- a/docker/opensuse-tumbleweed/docker_run.sh +++ b/docker/opensuse-tumbleweed/docker_run.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse-tumbleweed:1.0 +docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -w /home/rrg/proxmark3 -it pm3-suse-tumbleweed:1.0