From 0da6f94f444f9f799b75b32b11bc95fa78727dea Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Sat, 6 Jun 2020 19:30:35 +0200 Subject: [PATCH 1/3] Windows integration --- accountfree-build-img-wine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accountfree-build-img-wine/Dockerfile b/accountfree-build-img-wine/Dockerfile index e82231f..6bab957 100644 --- a/accountfree-build-img-wine/Dockerfile +++ b/accountfree-build-img-wine/Dockerfile @@ -19,4 +19,4 @@ RUN echo 'wine '\''C:\Python36\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyin RUN chmod +x /usr/bin/pyinstaller # Installing dependencies -RUN pip install streamlink pyside2 torrequest websocket-client +RUN pip install streamlink pyside2 torrequest websocket-client pywin32 From d6ffcfc498614c43488b4f8d720998b9537e29b3 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Thu, 27 Aug 2020 11:58:21 +0200 Subject: [PATCH 2/3] Windows PySide2 5.15.0, README --- .Dockerfile.kate-swp | Bin 111 -> 0 bytes README.md | 10 +++ accountfree-build-img-wine/Dockerfile | 22 +++--- ubuntu-pyside2-xvfb-wine/Dockerfile | 97 ++---------------------- ubuntu-pyside2-xvfb-wine/Dockerfile-old | 89 ++++++++++++++++++++++ 5 files changed, 117 insertions(+), 101 deletions(-) delete mode 100644 .Dockerfile.kate-swp create mode 100644 README.md create mode 100644 ubuntu-pyside2-xvfb-wine/Dockerfile-old diff --git a/.Dockerfile.kate-swp b/.Dockerfile.kate-swp deleted file mode 100644 index 4f04fe04c77389db6d01beade25a495abb41cc0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmZQzU=Z?7EJ;-eE>A2_aLdd|RWQ;sU|?Vn;WaYmGuUdV@?-9k6BmoC?&xWTehKyj z$}j>k2&noxdisR`v1^cmcV=! /usr/bin/pyinstaller -RUN chmod +x /usr/bin/pyinstaller - # Installing dependencies RUN pip install pyside2 packaging websocket-client pywin32 stem requests diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile b/ubuntu-pyside2-xvfb-wine/Dockerfile index f15f988..da08cf1 100644 --- a/ubuntu-pyside2-xvfb-wine/Dockerfile +++ b/ubuntu-pyside2-xvfb-wine/Dockerfile @@ -1,90 +1,9 @@ -FROM ubuntu:19.10 +FROM cdrx/pyinstaller-windows:python3 -# 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.6 -ARG PYINSTALLER_VERSION=3.6 - -# 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 - #&& apt-get install --no-install-recommends -qfy gcc-multilib libasound2-dev:i386 libgsm1-dev:i386 libjpeg8-dev:i386 liblcms2-dev:i386 libldap2-dev:i386 libmpg123-dev:i386 libopenal-dev:i386 libv4l-dev:i386 libx11-dev:i386 libxinerama-dev:i386 libxml2-dev:i386 zlib1g-dev:i386 \ - #&& apt-get install --no-install-recommends -qfy libcapi20-dev:i386 libcups2:i386 libdbus-1-3:i386 libfontconfig:i386 libfreetype6:i386 libglu1-mesa:i386 libgphoto2-6:i386 libncurses5:i386 libosmesa6:i386 libsane:i386 libxcomposite1:i386 libxcursor1:i386 libxi6:i386 libxrandr2:i386 libxslt1.1:i386 ocl-icd-libopencl1:i386 libgd3:i386 -# 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-staging-amd64 wine-staging \ - && 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 - -# 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:/Python37; \ - 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"/ - -# Installing Xvfb to display -RUN apt-get install xvfb git p7zip-full -y - -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 pip install PySide2 +ARG PYSIDE2_VERSION=5.15.0 + +RUN apt update -qy \ + && apt upgrade -qy +RUN apt install -y rename wget curl p7zip-full git xvfb +RUN apt clean +RUN pip install PySide2==$PYSIDE2_VERSION diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile-old b/ubuntu-pyside2-xvfb-wine/Dockerfile-old new file mode 100644 index 0000000..8c628c4 --- /dev/null +++ b/ubuntu-pyside2-xvfb-wine/Dockerfile-old @@ -0,0 +1,89 @@ +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 From 64224e3439526d6c7cb2dda763d86d914d730e65 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Wed, 30 Jun 2021 19:54:26 +0200 Subject: [PATCH 3/3] 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 | 10 ++-- accountfree-build-img/Dockerfile | 3 +- ubuntu-pyside2-xvfb-wine/Dockerfile | 86 ++++++++++++++++++++++++--- ubuntu-pyside2-xvfb/Dockerfile | 8 ++- 4 files changed, 91 insertions(+), 16 deletions(-) diff --git a/accountfree-build-img-wine/Dockerfile b/accountfree-build-img-wine/Dockerfile index c83eb02..d94fee1 100644 --- a/accountfree-build-img-wine/Dockerfile +++ b/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/* \ - && rm tor-win64-0.4.3.6.zip \ + && unzip tor-win64-0.4.5.9.zip -x Data/* \ + && 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 diff --git a/accountfree-build-img/Dockerfile b/accountfree-build-img/Dockerfile index ed9e960..d327e20 100644 --- a/accountfree-build-img/Dockerfile +++ b/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 diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile b/ubuntu-pyside2-xvfb-wine/Dockerfile index da08cf1..8f7682a 100644 --- a/ubuntu-pyside2-xvfb-wine/Dockerfile +++ b/ubuntu-pyside2-xvfb-wine/Dockerfile @@ -1,9 +1,81 @@ -FROM cdrx/pyinstaller-windows:python3 +FROM ubuntu:hirsute -ARG PYSIDE2_VERSION=5.15.0 - -RUN apt update -qy \ - && apt upgrade -qy -RUN apt install -y rename wget curl p7zip-full git xvfb +ARG PYSIDE2_VERSION=5.15.2 + +# Adapted rom https://github.com/cdrx/docker-pyinstaller/blob/master/Dockerfile-py3-win64 +# Unupdated for a while. + +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 diff --git a/ubuntu-pyside2-xvfb/Dockerfile b/ubuntu-pyside2-xvfb/Dockerfile index ea70258..3a1fcb0 100644 --- a/ubuntu-pyside2-xvfb/Dockerfile +++ b/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 pip3 install PySide2 +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==$PYSIDE2_VERSION