Merge branch 'add-python' into 'master'

Add Python to the build images

See merge request docker-images/gr-build-images!33

arch-self-contained/Dockerfile

@@ -17,6 +17,7 @@ RUN pacman -Syu --noconfirm && \
         nasm \
         patch \
         pkgconf \
+        python \
         qt5-base \
         qt6-base \
         which \

centos7-32bit-self-contained/Dockerfile

@@ -5,4 +5,22 @@ COPY basearch /etc/yum/vars/basearch
 RUN yum update -y && \
     yum groupinstall -y "Development Tools" && \
     yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ libjpeg-turbo-devel mesa-libGL-devel libXt-devel libX11-devel libXrender-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel qt5-qtbase-devel gtk2-devel qt-devel nasm
+    yum install -y \
+        gcc \
+        gcc-c++ \
+        gtk2-devel \
+        libX11-devel \
+        libXcursor-devel \
+        libXi-devel \
+        libXinerama-devel \
+        libXrandr-devel \
+        libXrender-devel \
+        libXt-devel \
+        libjpeg-turbo-devel \
+        mesa-libGL-devel \
+        nasm \
+        python3 \
+        qt-devel \
+        qt5-qtbase-devel \
+        which && \
+    yum clean all

centos7-32bit-system-dependencies/Dockerfile

@@ -5,4 +5,17 @@ COPY basearch /etc/yum/vars/basearch
 RUN yum update -y && \
     yum groupinstall -y "Development Tools" && \
     yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ libjpeg-turbo-devel cmake patch PyQt4-devel ghostscript-devel texlive-collection-latex texlive-dvipng cairo-devel git
+    yum install -y \
+        PyQt4-devel \
+        cairo-devel \
+        cmake \
+        gcc \
+        gcc-c++ \
+        ghostscript-devel \
+        git \
+        libjpeg-turbo-devel \
+        patch \
+        texlive-collection-latex \
+        texlive-dvipng \
+        which && \
+    yum clean all

centos7-self-contained/Dockerfile

@@ -3,6 +3,23 @@ FROM centos:7
 RUN yum update -y && \
     yum groupinstall -y "Development Tools" && \
     yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ mesa-libGL-devel libXt-devel libX11-devel libXrender-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel qt5-qtbase-devel gtk2-devel qt-devel nasm && \
+    yum install -y \
+        gcc \
+        gcc-c++ \
+        gtk2-devel \
+        libX11-devel \
+        libXcursor-devel \
+        libXi-devel \
+        libXinerama-devel \
+        libXrandr-devel \
+        libXrender-devel \
+        libXt-devel \
+        mesa-libGL-devel \
+        nasm \
+        python3 \
+        qt-devel \
+        qt5-qtbase-devel \
+        which && \
     yum install -y centos-release-scl && \
-    yum install -y devtoolset-8
+    yum install -y devtoolset-8 && \
+    yum clean all

centos7-system-dependencies/Dockerfile

@@ -3,6 +3,18 @@ FROM centos:7
 RUN yum update -y && \
     yum groupinstall -y "Development Tools" && \
     yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ cmake patch PyQt4-devel ghostscript-devel texlive-collection-latex texlive-dvipng cairo-devel git && \
+    yum install -y \
+        PyQt4-devel \
+        cairo-devel \
+        cmake \
+        gcc \
+        gcc-c++ \
+        ghostscript-devel \
+        git \
+        patch \
+        texlive-collection-latex \
+        texlive-dvipng \
+        which && \
     yum install -y centos-release-scl && \
-    yum install -y devtoolset-8
+    yum install -y devtoolset-8 && \
+    yum clean all

code-style-check/Dockerfile

@@ -7,8 +7,14 @@ ARG CMAKE_FORMAT_VERSION="0.6.7"
 ENV PATH="/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 RUN apt-get update && \
-    apt-get install -y --no-install-recommends "clang-format-${CLANG_FORMAT_VERSION}" file git python3-pip \
-                                               python3-venv python3-setuptools python3-wheel && \
+    apt-get install -y --no-install-recommends \
+        "clang-format-${CLANG_FORMAT_VERSION}" \
+        file \
+        git \
+        python3-pip \
+        python3-setuptools \
+        python3-venv \
+        python3-wheel && \
     update-alternatives --install "/usr/bin/clang-format" \
                                   "clang-format" \
                                   "/usr/bin/clang-format-${CLANG_FORMAT_VERSION}" \

debian-self-contained-aarch64/Dockerfile

@@ -5,5 +5,30 @@ RUN apt-get update && \
     apt-get install -y binfmt-support qemu-user-static && \
     dpkg --add-architecture arm64 && \
     apt-get update && \
-    apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu curl wget git cmake make patch bzip2 pkg-config libgl1-mesa-dev:arm64 libglu1-mesa-dev:arm64 libx11-dev:arm64 libxft-dev:arm64 libxt-dev:arm64 libxcursor-dev:arm64 libxrandr-dev:arm64 qt5-default:arm64 libgtk2.0-dev:arm64 gtk2.0-examples:arm64 libwxgtk3.0-dev:arm64 qt4-dev-tools:arm64 qtbase5-dev:arm64 qtbase5-dev-tools:arm64 && \
+    apt-get install -y \
+        bzip2 \
+        cmake \
+        curl \
+        g++-aarch64-linux-gnu \
+        gcc-aarch64-linux-gnu \
+        git \
+        gtk2.0-examples:arm64 \
+        libgl1-mesa-dev:arm64 \
+        libglu1-mesa-dev:arm64 \
+        libgtk2.0-dev:arm64 \
+        libwxgtk3.0-dev:arm64 \
+        libx11-dev:arm64 \
+        libxcursor-dev:arm64 \
+        libxft-dev:arm64 \
+        libxrandr-dev:arm64 \
+        libxt-dev:arm64 \
+        make \
+        patch \
+        pkg-config \
+        python3 \
+        qt4-dev-tools:arm64 \
+        qt5-default:arm64 \
+        qtbase5-dev-tools:arm64 \
+        qtbase5-dev:arm64 \
+        wget && \
     rm -rf /var/lib/apt/lists/*

debian-self-contained-armhf/Dockerfile

@@ -5,5 +5,31 @@ RUN apt-get update && \
     apt-get install -y binfmt-support qemu-user-static && \
     dpkg --add-architecture armhf && \
     apt-get update && \
-    apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf curl wget git cmake make patch bzip2 pkg-config libgl1-mesa-dev:armhf libglu1-mesa-dev:armhf libx11-dev:armhf libxft-dev:armhf libxt-dev:armhf libxcursor-dev:armhf libxrandr-dev:armhf qt5-default:armhf libgtk2.0-dev:armhf gtk2.0-examples:armhf libwxgtk3.0-dev:armhf qt4-dev-tools:armhf qt4-qmake:armhf qtbase5-dev:armhf qtbase5-dev-tools:armhf && \
+    apt-get install -y \
+        bzip2 \
+        cmake \
+        curl \
+        g++-arm-linux-gnueabihf \
+        gcc-arm-linux-gnueabihf \
+        git \
+        gtk2.0-examples:armhf \
+        libgl1-mesa-dev:armhf \
+        libglu1-mesa-dev:armhf \
+        libgtk2.0-dev:armhf \
+        libwxgtk3.0-dev:armhf \
+        libx11-dev:armhf \
+        libxcursor-dev:armhf \
+        libxft-dev:armhf \
+        libxrandr-dev:armhf \
+        libxt-dev:armhf \
+        make \
+        patch \
+        pkg-config \
+        python3 \
+        qt4-dev-tools:armhf \
+        qt4-qmake:armhf \
+        qt5-default:armhf \
+        qtbase5-dev-tools:armhf \
+        qtbase5-dev:armhf \
+        wget && \
     rm -rf /var/lib/apt/lists/*

debian-self-contained/Dockerfile

@@ -3,5 +3,24 @@ FROM debian:10
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y wget make patch gcc g++ xz-utils lbzip2 libgl1-mesa-dev libglu1-mesa-dev xorg-dev git qt5-default libgtk2.0-dev gtk2.0-examples libwxgtk3.0-dev qt4-dev-tools qtbase5-dev nasm && \
+    apt-get install -y \
+        g++ \
+        gcc \
+        git \
+        gtk2.0-examples \
+        lbzip2 \
+        libgl1-mesa-dev \
+        libglu1-mesa-dev \
+        libgtk2.0-dev \
+        libwxgtk3.0-dev \
+        make \
+        nasm \
+        patch \
+        python3 \
+        qt4-dev-tools \
+        qt5-default \
+        qtbase5-dev \
+        wget \
+        xorg-dev \
+        xz-utils && \
     rm -rf /var/lib/apt/lists/*

debian-system-dependencies-armhf/Dockerfile

@@ -5,5 +5,32 @@ RUN apt-get update && \
     apt-get install -y binfmt-support qemu-user-static && \
     dpkg --add-architecture armhf && \
     apt-get update && \
-    apt-get install -y wget make gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libx11-dev:armhf libxft-dev:armhf libxt-dev:armhf python2.7:armhf texlive-latex-recommended dvipng:armhf libgl1-mesa-dev:armhf libgs-dev:armhf libgtk2.0-dev:armhf libwxgtk3.0-dev:armhf libglfw3-dev:armhf libzmq3-dev:armhf cmake git libavcodec-dev:armhf libavutil-dev:armhf libswscale-dev:armhf libavformat-dev:armhf qt5-default:armhf qt4-dev-tools:armhf qt4-qmake:armhf qtbase5-dev:armhf qtbase5-dev-tools:armhf && \
+    apt-get install -y \
+        cmake \
+        dvipng:armhf \
+        g++-arm-linux-gnueabihf \
+        gcc-arm-linux-gnueabihf \
+        git \
+        libavcodec-dev:armhf \
+        libavformat-dev:armhf \
+        libavutil-dev:armhf \
+        libgl1-mesa-dev:armhf \
+        libglfw3-dev:armhf \
+        libgs-dev:armhf \
+        libgtk2.0-dev:armhf \
+        libswscale-dev:armhf \
+        libwxgtk3.0-dev:armhf \
+        libx11-dev:armhf \
+        libxft-dev:armhf \
+        libxt-dev:armhf \
+        libzmq3-dev:armhf \
+        make \
+        python2.7:armhf \
+        qt4-dev-tools:armhf \
+        qt4-qmake:armhf \
+        qt5-default:armhf \
+        qtbase5-dev-tools:armhf \
+        qtbase5-dev:armhf \
+        texlive-latex-recommended \
+        wget && \
     rm -rf /var/lib/apt/lists/*

debian-system-dependencies/Dockerfile

@@ -3,5 +3,29 @@ FROM debian:10
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex-recommended dvipng libgl1-mesa-dev qt4-dev-tools pyqt4-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
+    apt-get install -y \
+        cmake \
+        dvipng \
+        g++ \
+        gcc \
+        git \
+        libavcodec-dev \
+        libavformat-dev \
+        libavutil-dev \
+        libgl1-mesa-dev \
+        libglfw3-dev \
+        libgs-dev \
+        libgtk2.0-dev \
+        libswscale-dev \
+        libwxgtk3.0-dev \
+        libx11-dev \
+        libxft-dev \
+        libxt-dev \
+        libzmq3-dev \
+        make \
+        pyqt4-dev-tools \
+        python2.7 \
+        qt4-dev-tools \
+        texlive-latex-recommended \
+        wget && \
     rm -rf /var/lib/apt/lists/*

deploy/Dockerfile

@@ -2,5 +2,9 @@ FROM ubuntu:18.04
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y git python3-pip rsync sshpass && \
+    apt-get install -y \
+        git \
+        python3-pip \
+        rsync \
+        sshpass && \
     rm -rf /var/lib/apt/lists/*

ubuntu-self-contained/Dockerfile

@@ -3,5 +3,21 @@ FROM ubuntu:20.04
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y wget make gcc g++ libgl1-mesa-dev libglu1-mesa-dev xorg-dev git qt5-default libgtk2.0-dev gtk2.0-examples libwxgtk3.0-gtk3-dev qtbase5-dev nasm libidn11-dev && \
+    apt-get install -y \
+        g++ \
+        gcc \
+        git \
+        gtk2.0-examples \
+        libgl1-mesa-dev \
+        libglu1-mesa-dev \
+        libgtk2.0-dev \
+        libidn11-dev \
+        libwxgtk3.0-gtk3-dev \
+        make \
+        nasm \
+        python3 \
+        qt5-default \
+        qtbase5-dev \
+        wget \
+        xorg-dev && \
     rm -rf /var/lib/apt/lists/*

ubuntu-system-dependencies/Dockerfile

@@ -3,5 +3,30 @@ FROM ubuntu:20.04
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
     DEBIAN_FRONTEND=noninteractive \
-    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex-recommended dvipng libgl1-mesa-dev qt5-default qtbase5-dev pyqt5-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-gtk3-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
+    apt-get install -y \
+        cmake \
+        dvipng \
+        g++ \
+        gcc \
+        git \
+        libavcodec-dev \
+        libavformat-dev \
+        libavutil-dev \
+        libgl1-mesa-dev \
+        libglfw3-dev \
+        libgs-dev \
+        libgtk2.0-dev \
+        libswscale-dev \
+        libwxgtk3.0-gtk3-dev \
+        libx11-dev \
+        libxft-dev \
+        libxt-dev \
+        libzmq3-dev \
+        make \
+        pyqt5-dev-tools \
+        python2.7 \
+        qt5-default \
+        qtbase5-dev \
+        texlive-latex-recommended \
+        wget && \
     rm -rf /var/lib/apt/lists/*

windows-32bit-cross/Dockerfile

@@ -2,7 +2,20 @@ FROM debian:10
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git && \
+    apt-get install -y \
+        cmake \
+        g++ \
+        gcc \
+        git \
+        lbzip2 \
+        make \
+        mingw-w64 \
+        patch \
+        pkg-config \
+        python3 \
+        wget \
+        xorg-dev \
+        xz-utils && \
     rm -rf /var/lib/apt/lists/*
 
 RUN wget "https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz" && \

windows-64bit-cross/Dockerfile

@@ -2,7 +2,20 @@ FROM debian:10
 
 RUN apt-get update && \
     apt-get dist-upgrade -y && \
-    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git && \
+    apt-get install -y \
+        cmake \
+        g++ \
+        gcc \
+        git \
+        lbzip2 \
+        make \
+        mingw-w64 \
+        patch \
+        pkg-config \
+        python3 \
+        wget \
+        xorg-dev \
+        xz-utils && \
     rm -rf /var/lib/apt/lists/*
 
 RUN wget "https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz" && \