update dockerfiles to add python script support

gm3197 · Oct 11, 2021 · 8837ff7 · 8837ff7
1 parent f125cdd
commit 8837ff7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/docker/archlinux/Dockerfile b/docker/archlinux/Dockerfile
@@ -4,7 +4,8 @@ ENV LANG C
 RUN pacman -Syy
 RUN pacman-db-upgrade
 # qt5-base skipped
-RUN pacman -S --noconfirm sudo git base-devel cmake libusb readline bzip2 arm-none-eabi-gcc arm-none-eabi-newlib --needed
+# 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
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg

diff --git a/docker/archlinux/README.md b/docker/archlinux/README.md
@@ -15,7 +15,7 @@ EOF
 
 sudo pacman -Sy
 
-# serch available versions
+# search available versions
 pacman -Ss '^arm-none-eabi-gcc$'
 pacman -Ss '^gcc$'
 
@@ -32,7 +32,6 @@ sudo pacman -S gcc
 Add first the mirrors, see above
 
 ```
-sudo pacman -S python
 sudo pacman -S python-pip
 python3 -m pip install ansicolors sslcrypto
 tools/pm3_tests.sh --long

diff --git a/docker/debian-bullseye/Dockerfile b/docker/debian-bullseye/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # qtbase5-dev skipped
 RUN apt-get update && \
     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 libbluetooth-dev sudo && \
+    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 libbluetooth-dev libpython3-dev sudo && \
     apt-get clean
 
 # Create rrg user

diff --git a/docker/fedora-34/Dockerfile b/docker/fedora-34/Dockerfile
@@ -2,7 +2,7 @@ FROM fedora:34
 
 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 libatomic
+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 libatomic
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg

diff --git a/docker/opensuse-leap/Dockerfile b/docker/opensuse-leap/Dockerfile
@@ -2,7 +2,7 @@ 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
+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
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg

diff --git a/docker/opensuse-tumbleweed/Dockerfile b/docker/opensuse-tumbleweed/Dockerfile
@@ -2,7 +2,7 @@ FROM opensuse/tumbleweed
 
 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-gcc11 cross-arm-none-newlib-devel
+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 cross-arm-none-gcc11 cross-arm-none-newlib-devel
 
 # Create rrg user
 RUN useradd -ms /bin/bash rrg

diff --git a/docker/ubuntu-18.04/Dockerfile b/docker/ubuntu-18.04/Dockerfile
@@ -3,6 +3,7 @@ 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 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 libbluetooth-dev sudo && \

diff --git a/docker/ubuntu-20.04/Dockerfile b/docker/ubuntu-20.04/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND noninteractive
 # qtbase5-dev skipped
 RUN apt-get update && \
     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 libbluetooth-dev sudo && \
+    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 libbluetooth-dev libpython3-dev sudo && \
     apt-get clean
 
 # Create rrg user