0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove left over paramiko usage from dockerfiles.

Browse source
This commit is contained in:
Pentarctagon 2021-03-07 16:49:22 -06:00
parent b56a44ed66
commit cb5f45cae6
No known key found for this signature in database
GPG key ID: 9456BC54A21DBFA0
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/dockerbuilds/CI/Dockerfile-base-1804-master
View file

@ -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

4
utils/dockerbuilds/CI/Dockerfile-base-2004-master
View file

@ -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

4
utils/dockerbuilds/CI/Dockerfile-base-mingw
View file

@ -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