diff --git a/utils/dockerbuilds/CI/Dockerfile-base-1804-master b/utils/dockerbuilds/CI/Dockerfile-base-1804-master index b6744e77187..ca5332b4363 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-1804-master +++ b/utils/dockerbuilds/CI/Dockerfile-base-1804-master @@ -18,9 +18,7 @@ RUN apt install -y -qq asciidoc dos2unix xsltproc po4a docbook-xsl language-pack RUN locale-gen en_US.UTF-8 # misc -RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip moreutils -RUN pip3 install --upgrade pip -RUN yes | pip3 install paramiko +RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev moreutils # programs RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld doxygen graphviz diff --git a/utils/dockerbuilds/CI/Dockerfile-base-2004-master b/utils/dockerbuilds/CI/Dockerfile-base-2004-master index f7553cc1e4e..f26e7bca58e 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-2004-master +++ b/utils/dockerbuilds/CI/Dockerfile-base-2004-master @@ -18,9 +18,7 @@ RUN apt install -y -qq asciidoc dos2unix xsltproc po4a docbook-xsl language-pack RUN locale-gen en_US.UTF-8 # misc -RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev python3-pip moreutils -RUN pip3 install --upgrade pip -RUN yes | pip3 install paramiko +RUN apt install -y -qq libpng16-16 libpng-dev libreadline6-dev libvorbis-dev libcairo2 libcairo2-dev libpango-1.0-0 libpango1.0-dev libfribidi0 libfribidi-dev libbz2-1.0 libbz2-dev zlib1g zlib1g-dev libpangocairo-1.0-0 libssl-dev libmysqlclient-dev expect-dev moreutils # programs RUN apt install -y -qq openssl gdb xvfb bzip2 git scons cmake make ccache gcc g++ clang lld doxygen graphviz diff --git a/utils/dockerbuilds/CI/Dockerfile-base-mingw b/utils/dockerbuilds/CI/Dockerfile-base-mingw index 508b924de5a..7aaa0c260cc 100644 --- a/utils/dockerbuilds/CI/Dockerfile-base-mingw +++ b/utils/dockerbuilds/CI/Dockerfile-base-mingw @@ -2,9 +2,7 @@ FROM rwgrim/msys2-cross ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y scons g++-mingw-w64-x86-64 pkg-config python3-pefile expect python3-pip nsis gettext git && \ - pip3 install --upgrade pip && \ - yes | pip3 install paramiko && \ + apt-get install -y scons g++-mingw-w64-x86-64 pkg-config python3-pefile expect nsis gettext git && \ update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix && \ apt-get clean && \ rm -rf /var/lib/apt/lists