Updating to pyside2 5.12.5, ubuntu version to hirsute, pyinstaller to 4.3, and python to 3.9.5/6

accountfree-build-img-wine/Dockerfile

@@ -1,15 +1,15 @@
-FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.15.0
+FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.15.2
 
 RUN apt-get update
 RUN apt install unzip nsis -y
 RUN apt clean
 # Installing tor
-RUN wget https://dist.torproject.org/torbrowser/9.5.4/tor-win64-0.4.3.6.zip \
+RUN wget https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip \
     && ls -la \
-    && unzip tor-win64-0.4.3.6.zip -x Data/* \
+    && unzip tor-win64-0.4.5.9.zip -x Data/* \
-    && rm tor-win64-0.4.3.6.zip \
+    && rm tor-win64-0.4.5.9.zip \
     && mv Tor /wine/drive_c/
 
 RUN wine reg ADD "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" /v PATH /f /t REG_EXPAND_SZ /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;C:\Tor"
 # Installing dependencies
-RUN pip install pyside2 packaging websocket-client pywin32 stem requests
+RUN pip install packaging websocket-client pywin32 stem requests

accountfree-build-img/Dockerfile

@@ -1,6 +1,7 @@
-FROM ad5001/ubuntu-pyside2-xvfb:focal-5.15.0
+FROM ad5001/ubuntu-pyside2-xvfb:hirsute-5.15.2
 
 ARG DEBIAN_FRONTEND=noninteractive
+
 ENV TZ=Europe/Paris
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get -y install tor qml-module-qtqml-models2 qml-module-qtquick-controls python3-stdeb python-all python3-requests python3-stem rpm dh-python

ubuntu-pyside2-xvfb-wine/Dockerfile

@@ -1,9 +1,81 @@
-FROM cdrx/pyinstaller-windows:python3
+FROM ubuntu:hirsute
 
-ARG PYSIDE2_VERSION=5.15.0
+ARG PYSIDE2_VERSION=5.15.2
 
-RUN apt update -qy \
+# Adapted rom https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
-    && apt upgrade -qy
+# Unupdated for a while.
-RUN apt install -y rename wget curl p7zip-full git xvfb
+
+ENV DEBIAN_FRONTEND noninteractive
+
+ARG WINE_VERSION=winehq-staging
+ARG PYTHON_VERSION=3.9.6
+ARG PYINSTALLER_VERSION=4.3
+
+# we need wine for this all to work, so we'll use the PPA
+RUN set -x \
+    && dpkg --add-architecture i386 \
+    && apt-get update -qy \
+    && apt-get install --no-install-recommends -qfy rename apt-transport-https software-properties-common wget gpg-agent \
+    && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
+    && apt-key add winehq.key \
+    && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
+    && apt-get update -qy \
+    && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
+    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
+    && chmod +x winetricks \
+    && mv winetricks /usr/local/bin
+
+# wine settings
+ENV WINEARCH win64
+ENV WINEDEBUG fixme-all
+ENV WINEPREFIX /wine
+
+# PYPI repository location
+ENV PYPI_URL=https://pypi.python.org/
+# PYPI index location
+ENV PYPI_INDEX_URL=https://pypi.python.org/simple
+
+# install python in wine, using the msi packages to install, extracting
+# the files directly, since installing isn't running correctly.
+RUN set -x \
+    && winetricks win7 \
+    && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
+        wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python39; \
+        rm ${msifile}.msi; \
+    done \
+    && cd /wine/drive_c/Python39 \
+    && echo 'wine '\''C:\Python39\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python39\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python39\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python39\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
+    && echo 'wine '\''C:\Python39\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && echo 'assoc .py=PythonScript' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python39\python.exe "%1" %*' | wine cmd \
+    && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
+    && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyinstaller /usr/bin/pyupdater \
+    && (pip install -U pip || true) \
+    && rm -rf /tmp/.wine-*
+
+ENV W_DRIVE_C=/wine/drive_c
+ENV W_WINDIR_UNIX="$W_DRIVE_C/windows"
+ENV W_SYSTEM64_DLLS="$W_WINDIR_UNIX/system32"
+ENV W_TMP="$W_DRIVE_C/windows/temp/_$0"
+
+# install Microsoft Visual C++ Redistributable for Visual Studio 2017 dll files
+RUN set -x \
+    && rm -f "$W_TMP"/* \
+    && wget -P "$W_TMP" -v https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP"/VC_redist.x64.exe \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a10" \
+    && cabextract -q --directory="$W_TMP" "$W_TMP/a11" \
+    && cd "$W_TMP" \
+    && rename 's/_/\-/g' *.dll \
+    && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/
+
+# Additional data for PySide2
+
+RUN apt install -y wget curl p7zip-full git xvfb
 RUN apt clean
-RUN pip install PySide2==$PYSIDE2_VERSION
+# Installing pyside2 & pyinstaller
+RUN pip install wheel PySide2==$PYSIDE2_VERSION pyinstaller==$PYINSTALLER_VERSION

ubuntu-pyside2-xvfb/Dockerfile

@@ -1,7 +1,9 @@
-FROM ubuntu:focal
+FROM ubuntu:hirsute
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG PYSIDE2_VERSION=5.15.2
+
 ENV TZ=Europe/Paris
 RUN apt-get update
-RUN apt-get -y install qt5-default make git python3-pip qml-module-qtquick-controls2 qml-module-qtmultimedia qml-module-qtgraphicaleffects qml-module-qtquick2 xvfb
+RUN apt-get -y install make git python3-pip qml-module-qtquick-controls2 qml-module-qtmultimedia qml-module-qtgraphicaleffects qml-module-qtquick2 xvfb
-RUN pip3 install PySide2
+RUN pip3 install PySide2==$PYSIDE2_VERSION