update docker scripts

docker/build-all.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-for os in archlinux debian fedora homebrew opensuse ubuntu; do
+for os in archlinux debian-buster fedora-34 homebrew opensuse-leap opensuse-tumbleweed ubuntu-18.04 ubuntu-20.04; do
   (  cd $os && ./docker_build.sh )
 done

docker/debian-buster/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-debian-buster:1.0" .

docker/debian-buster/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-debian:1.0
+docker image rm pm3-debian-buster:1.0
 docker image rm buster-slim

docker/debian-buster/docker_run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-debian:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-debian-buster:1.0

docker/debian/docker_build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-debian:1.0" .

docker/fedora-34/Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:34
 
 ENV LANG C
 # qt5-qtbase-devel skipped

docker/fedora-34/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-fedora-34:1.0" .

docker/fedora-34/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-fedora-34:1.0
+docker image rm fedora:34

docker/fedora-34/docker_run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-fedora:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-fedora-34:1.0

docker/fedora/docker_build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-fedora:1.0" .

docker/fedora/docker_rm.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-fedora:1.0
-docker image rm fedora:31

docker/opensuse-leap/Dockerfile

@@ -0,0 +1,15 @@
+FROM opensuse/leap
+
+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 cross-arm-none-gcc9 cross-arm-none-newlib-devel
+
+# Create rrg user
+RUN useradd -ms /bin/bash rrg
+RUN passwd -d rrg
+RUN printf 'rrg ALL=(ALL) NOPASSWD: ALL\n' | tee -a /etc/sudoers
+
+USER rrg
+WORKDIR "/home/rrg"
+
+CMD ["/bin/bash"]

docker/opensuse-leap/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-suse-leap:1.0" .

docker/opensuse-leap/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-suse-leap:1.0
+docker image rm opensuse/leap

docker/opensuse-leap/docker_run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse-leap:1.0

docker/opensuse-tumbleweed/Dockerfile

@@ -1,4 +1,3 @@
-#FROM opensuse/leap
 FROM opensuse/tumbleweed
 
 ENV LANG C

docker/opensuse-tumbleweed/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-suse-tumbleweed:1.0" .

docker/opensuse-tumbleweed/docker_rm.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker image rm pm3-suse-tumbleweed:1.0
+docker image rm opensuse/tumbleweed

docker/opensuse-tumbleweed/docker_run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-suse-tumbleweed:1.0

docker/opensuse/docker_build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-suse:1.0" .

docker/opensuse/docker_rm.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-docker image rm pm3-suse:1.0
-docker image rm opensuse/tumbleweed opensuse/leap

docker/ubuntu-18.04/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-18.04:1.0" .

docker/ubuntu-18.04/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-ubuntu18:1.0
+docker image rm pm3-ubuntu-18.04:1.0
 docker image rm ubuntu:18.04

docker/ubuntu-18.04/docker_run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu20:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-18.04:1.0

docker/ubuntu-20.04/docker_build.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build -t "pm3-ubuntu-20.04:1.0" .

docker/ubuntu-20.04/docker_rm.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-docker image rm pm3-ubuntu20:1.0
+docker image rm pm3-ubuntu-20.04:1.0
 docker image rm ubuntu:20.04

docker/ubuntu-20.04/docker_run.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu18:1.0
+docker run --volume=$(pwd)/../..:/home/rrg/proxmark3 -it pm3-ubuntu-20.04:1.0

docker/ubuntu18/docker_build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-ubuntu18:1.0" .

docker/ubuntu20/docker_build.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker build -t "pm3-ubuntu20:1.0" .