Adding PySide6
This commit is contained in:
parent
57021a5fb6
commit
a2725df22e
GPG key ID:
EF45F9C6AFE20160
|
|
@ -2,9 +2,11 @@
|
|||
---
|
||||
|
||||
This repository contains the Dockerfiles required to build AccountFree:
|
||||
- ubuntu-pyside6-xvfb: Ubuntu jammy base containing PySide6 (Qt for Python) & Xvfb (virtual X server that does not require a display).
|
||||
- ubuntu-pyside6-xvfb-wine: Contains the latest wine installation, with Windows python3, PySide6 & pyinstaller + Xvfb.
|
||||
- ubuntu-pyside2-xvfb: Ubuntu focal base containing PySide2 (Qt for Python) & Xvfb (virtual X server that does not require a display).
|
||||
- ubuntu-pyside2-xvfb-wine: Contains the latest wine installation, with Windows python3, PySide2 & pyinstaller + Xvfb.
|
||||
- accountfree-build-img: Based on ubuntu-pyside2-xvfb, contains AccountFree dependencies to build it's Linux packages.
|
||||
- accountfree-build-img: Based on ubuntu-pyside2-xvfb-wine, contains AccountFree dependencies to build it's Windows installer.
|
||||
|
||||
NOTE: In Docker, use xvfb-runto run a program within a Xvfb server.
|
||||
NOTE: In Docker, use xvfb-run to run a program within a Xvfb server.
|
||||
|
|
|
|||
81
ubuntu-pyside6-xvfb-wine/Dockerfile
Normal file
81
ubuntu-pyside6-xvfb-wine/Dockerfile
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
FROM ubuntu:jammy
|
||||
|
||||
ARG PYSIDE2_VERSION=6.5.0
|
||||
|
||||
# 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.11.3
|
||||
ARG PYINSTALLER_VERSION=5.11.0
|
||||
|
||||
# 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:/Python311; \
|
||||
rm ${msifile}.msi; \
|
||||
done \
|
||||
&& cd /wine/drive_c/Python311 \
|
||||
&& echo 'wine '\''C:\Python311\python.exe'\'' "$@"' > /usr/bin/python \
|
||||
&& echo 'wine '\''C:\Python311\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
|
||||
&& echo 'wine '\''C:\Python311\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
|
||||
&& echo 'wine '\''C:\Python311\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller \
|
||||
&& echo 'wine '\''C:\Python311\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
|
||||
&& echo 'assoc .py=PythonScript' | wine cmd \
|
||||
&& echo 'ftype PythonScript=c:\Python311\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 PySide6
|
||||
|
||||
RUN apt install -y wget curl p7zip-full git xvfb unzip nsis
|
||||
RUN apt clean
|
||||
# Installing pyside6 & pyinstaller
|
||||
RUN pip install wheel PySide6==$PYSIDE2_VERSION pyinstaller==$PYINSTALLER_VERSION
|
||||
10
ubuntu-pyside6-xvfb/Dockerfile
Normal file
10
ubuntu-pyside6-xvfb/Dockerfile
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
FROM ubuntu:jammy
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG PYSIDE2_VERSION=6.5.0
|
||||
|
||||
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 xdotool wmctrl libxcb-cursor0
|
||||
RUN python3 -m pip install PySide6==$PYSIDE2_VERSION
|
||||
RUN apt clean
|
||||
Loading…
Reference in a new issue