Updating files.

accountfree-build-img-wine/Dockerfile

@@ -4,7 +4,7 @@ RUN apt-get update \
     && apt install unzip nsis curl -y
 RUN apt clean
 # Installing tor
-RUN wget https://dist.torproject.org/torbrowser/10.0.18/tor-win64-0.4.5.9.zip \
+RUN wget https://dist.torproject.org/torbrowser/10.5.4/tor-win64-0.4.5.9.zip \
     && ls -la \
     && unzip tor-win64-0.4.5.9.zip -x Data/* \
     && rm tor-win64-0.4.5.9.zip \

accountfree-build-img/Dockerfile

@@ -4,5 +4,5 @@ ARG DEBIAN_FRONTEND=noninteractive
 
 ENV TZ=Europe/Paris
 RUN apt-get update && apt-get upgrade -y \
-    && apt-get -y install tor qml-module-qtqml-models2 qml-module-qtquick-controls python3-stdeb python-all python3-requests python3-stem rpm dh-python flatpak-builder snapcraft
+    && apt-get -y install tor qml-module-qtqml-models2 qml-module-qtquick-controls python3-stdeb python-all python3-requests python3-stem rpm dh-python
 RUN pip3 install packaging websocket-client

ubuntu-pyside2-xvfb-wine/Dockerfile

@@ -1,6 +1,6 @@
-FROM ubuntu:hirsute
+FROM ubuntu:jammy
 
-ARG PYSIDE2_VERSION=5.15.2
+ARG PYSIDE2_VERSION=5.15.2.1
 
 # Adapted rom https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64
 # Unupdated for a while.
@@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
 
 ARG WINE_VERSION=winehq-staging
 ARG PYTHON_VERSION=3.9.6
-ARG PYINSTALLER_VERSION=4.3
+ARG PYINSTALLER_VERSION=5.0.1
 
 # we need wine for this all to work, so we'll use the PPA
 RUN set -x \

ubuntu-pyside2-xvfb-wine/Dockerfile-old

@@ -1,89 +0,0 @@
-FROM ubuntu:20.04
-
-# Some of the work here comes from cdrx/docker-pyinstaller adapted for drone and with modifications for Qt
-ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.7.5
-ENV DEBIAN_FRONTEND "noninteractive"
-
-# Installing dependencies
-RUN set -x \
-    && dpkg --add-architecture i386 \
-    && apt-get update -qy \
-    && apt-get upgrade -qy \
-    && apt-get install --no-install-recommends -qfy rename gpg-agent apt-transport-https software-properties-common wget curl p7zip-full git xvfb
-# We need wine for this all to work, so we'll use the PPA
-RUN set -x \
-    && 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 \
-    && apt-get clean \
-    && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
-    && chmod +x winetricks \
-    && mv winetricks /usr/local/bin
-
-RUN apt-get clean
-
-# 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 tools`; do \
-        wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
-        echo "Installed ${msifile}"; \
-        rm ${msifile}.msi; \
-    done \
-    && cd /wine/drive_c/Python37 \
-    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
-    && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python37\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/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" 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"/
-
-
-ARG QT_VERSION=5.14.1
-ARG QT_COMPONENTS="qtbase qtquickcontrols qtquickcontrols2 qtmultimedia qtimageformats qtgraphicaleffects qtdeclarative qtconnectivity qtcharts"
-
-# Installing Qt & PySide2
-# Gathering silent install script
-# RUN wget https://download.ad5001.eu/other/qt-noninteractive-install.qs
-# RUN mv qt-noninteractive-install.qs /wine/drive_c/
-#RUN wget https://download.ad5001.eu/other/install-qt.sh \
-#    && chmod +x install-qt.sh \
-#    && ./install-qt.sh --host windows_x86 --version $QT_VERSION --directory /wine/drive_c/Qt --toolchain win64_msvc2017_64 $QT_COMPONENTS
-#RUN rm install-qt.sh
-RUN ls /wine/drive_c/Python37/Scripts
-RUN /usr/bin/pip install PySide2 pyinstaller

ubuntu-pyside2-xvfb/Dockerfile

@@ -1,9 +1,10 @@
-FROM ubuntu:hirsute
+FROM ubuntu:jammy
 
 ARG DEBIAN_FRONTEND=noninteractive
-ARG PYSIDE2_VERSION=5.15.2
+ARG PYSIDE2_VERSION=5.15.2.1
 
 ENV TZ=Europe/Paris
 RUN apt-get update
-RUN apt-get -y install 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 xdotool wmctrl
-RUN pip3 install PySide2==$PYSIDE2_VERSION
+RUN python3 -m pip install PySide2==$PYSIDE2_VERSION
+RUN apt clean