Fixing minor issues in the build
This commit is contained in:
parent
9fa96ef8dc
commit
e5684bec4f
4 changed files with 12 additions and 9 deletions
11
README.md
11
README.md
|
@ -3,26 +3,29 @@
|
|||
|
||||
This repository contains the Dockerfiles required to build all tags on [Docker Hub](https://hub.docker.com/repository/docker/ad5001/ubuntu-pyside-xvfb/):
|
||||
|
||||
All tags come with:
|
||||
## All tags
|
||||
|
||||
- a version of Python (v3.12 for PySide6, v3.10 for PySide2)
|
||||
- the tagged version of PySide2/6.
|
||||
- Python packages: `pip`, `requests`, `packaging`, `pytest` (+ `pytest-cov` + `pytest-qt`)
|
||||
- `xvfb`, `xdotool`, and `wmctrl`.
|
||||
|
||||
The linux tags have the following:
|
||||
## Linux tags
|
||||
- a Ubuntu base (noble for PySide6 and jammy for PySide2)
|
||||
- python3 is available under `/usr/bin/python3`.
|
||||
- External pip management disabled (allows you to install packages from pip directly).
|
||||
- `make`, `git`, `rpm`, and `dh-python`.
|
||||
|
||||
The wine tags have the following:
|
||||
Additionally, the linux-6*-latex tag include a full TeXlive installation including `dvipng` and the latex extras.
|
||||
|
||||
|
||||
## Wine tags
|
||||
- The latest `winehq-staging` under a Ubuntu base.
|
||||
- `/usr/bin/python` calling `python3` under wine.
|
||||
- `/usr/bin/pip` calling `pip` under wine.
|
||||
- `/usr/bin/pyinstaller` calling `pyinstaller` under wine.
|
||||
- `wget`, `curl`, `git`, `p7zip-full`, `unzip` and `nsis`.
|
||||
|
||||
Additionally, the LaTeX linux tag include a full TeXlive installation including `dvipng` and the latex extras.
|
||||
---
|
||||
|
||||
NOTE: In Docker, use xvfb-run to run a program within a Xvfb server.
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
FROM ubuntu:jammy # Jammy uses python3.10 and not 3.12, which is not compatible with PySide2.
|
||||
FROM ubuntu:jammy
|
||||
# Jammy uses python3.10 and not 3.12, which is not compatible with PySide2.
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG PYSIDE2_VERSION=5.15.2.1
|
||||
|
@ -7,8 +8,7 @@ ENV TZ=Europe/Paris
|
|||
RUN apt-get update
|
||||
RUN apt-get -y install make git rpm dh-python \
|
||||
xvfb xdotool wmctrl \
|
||||
python3 python3-pip python3-stdeb python-all python3-requests python3-packaging python3-pip python3-pytest python3-pytest-cov python3-pytestqt \
|
||||
python3 python3-pip python3-stdeb python3-requests python3-packaging python3-pip python3-pytest python3-pytest-cov python3-pytestqt \
|
||||
qml-module-qtquick-controls2 qml-module-qtmultimedia qml-module-qtgraphicaleffects qml-module-qtquick2 qml-module-qtqml-models2 qml-module-qtquick-controls
|
||||
RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED # Disable managed environment. We don't care about breaking system packages here.
|
||||
RUN python3 -m pip install PySide2==$PYSIDE2_VERSION
|
||||
RUN apt clean
|
||||
|
|
|
@ -8,7 +8,7 @@ ARG PYSIDE2_VERSION=5.15.2.1
|
|||
ENV DEBIAN_FRONTEND noninteractive
|
||||
|
||||
ARG WINE_VERSION=winehq-staging
|
||||
ARG PYTHON_VERSION=3.10.15 # Python3.10 are the last supported version of Python for PySide2.
|
||||
ARG PYTHON_VERSION=3.10.11 # Python3.10 are the last supported version of Python for PySide2.
|
||||
ARG PYINSTALLER_VERSION=5.0.1
|
||||
|
||||
# we need wine for this all to work, so we'll use the PPA
|
||||
|
|
|
@ -7,7 +7,7 @@ ENV TZ=Europe/Paris
|
|||
RUN apt-get update
|
||||
RUN apt-get -y install make git rpm dh-python \
|
||||
xvfb xdotool wmctrl \
|
||||
python3 python3-pip python3-stdeb python-all python3-requests python3-packaging python3-pip python3-pytest python3-pytest-cov python3-pytestqt
|
||||
python3 python3-pip python3-stdeb python3-requests python3-packaging python3-pip python3-pytest python3-pytest-cov python3-pytestqt
|
||||
RUN rm /usr/lib/python3.*/EXTERNALLY-MANAGED # Disable managed environment. We don't care about breaking system packages here.
|
||||
RUN python3 -m pip install PySide6==$PYSIDE2_VERSION
|
||||
RUN apt clean
|
||||
|
|
Loading…
Reference in a new issue