diff options
| author | Kali Kaneko <kali@leap.se> | 2018-02-11 22:31:54 +0100 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2018-02-15 16:36:42 +0100 |
| commit | 03e4bae0942c58344d6021fdaa08342baa7aea3c (patch) | |
| tree | e9cf6154c44016bdca3c98ed2a4c174b5fb8b972 /pkg/docker_bundle | |
| parent | f5839b1938ba7ab96f0d9777520a564975470f51 (diff) | |
[feat] implement fallback to webkit for bundles
in the end, depending on webengine didn't seem to be such a great idea:
it makes bundles more complex, heavy and brittle.
I tried compiling qt5 and the maintained qtwebkit fork, but that had
also its own set of problems (lastly, pyinstaller didn't work properly;
pyqt also adds a lot of garbage even if you disabled lots of modules you
don't need).
so, this is a fallback to a stretch-based build. it fixes the libGL
library by adding the right version into the bundle.
in this commit I also add a dockerfile for an image that can build
bundles by installing pip dependencies directly in the system. this has
the advantage that the build process is very fast, but the downside that
a new image needs to be pushed to the registry each time that new
dependencies are added; we'll also miss any bug due to introducing new
dependncies (but hopefully it will be catched by other steps in the CI).
The good side of it is that it reduces the need for some hacks in the
build process when bundling from a virtualenv.
Diffstat (limited to 'pkg/docker_bundle')
| -rw-r--r-- | pkg/docker_bundle/Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/docker_bundle/Dockerfile b/pkg/docker_bundle/Dockerfile index 30ed6859..b2974dfe 100644 --- a/pkg/docker_bundle/Dockerfile +++ b/pkg/docker_bundle/Dockerfile @@ -16,7 +16,8 @@ RUN apt update && apt upgrade -y RUN apt install -y --no-install-recommends \ build-essential virtualenv libpython-dev \ libsqlcipher-dev libssl-dev libffi-dev \ - python-pyqt5 python-pyqt5.qtwebengine python-pyqt5.qtwebchannel libqt5webengine-data \ + python-pyqt5 python-pyqt5.qtwebkit \ + libqt5printsupport5 \ qttranslations5-l10n libgl1-mesa-glx \ libusb-0.1-4 patchelf wget \ - gnupg1 git + gnupg1 git libgl1-mesa-glx |