summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-11-16 09:42:19 +0100
committerFlorian Bruhin <me@the-compiler.org>2022-11-16 09:42:19 +0100
commita03109dad22bdd0d6bba1e49a18cfcb429bf22a8 (patch)
tree4671fd7d6c1270aeb460961c64763b762b263a1a
parentf0489cb6a5df8e9ccbf675d8c5d37fbcaca4d844 (diff)
downloadqutebrowser-a03109dad22bdd0d6bba1e49a18cfcb429bf22a8.tar.gz
qutebrowser-a03109dad22bdd0d6bba1e49a18cfcb429bf22a8.zip
ci: Fix docker build and add sanity check
-rw-r--r--scripts/dev/ci/docker/Dockerfile.j215
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2
index 5c8aa4404..9aef5e16e 100644
--- a/scripts/dev/ci/docker/Dockerfile.j2
+++ b/scripts/dev/ci/docker/Dockerfile.j2
@@ -12,9 +12,6 @@ RUN pacman -Suyy --noconfirm \
{% if webengine %}
qt5-webengine python-pyqtwebengine \
python-pyqt5 \
- {% else %}
- https://archive.archlinux.org/packages/q/qt5-webkit/qt5-webkit-5.212.0alpha4-18-x86_64.pkg.tar.zst \
- https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst \
{% endif %}
xorg-xinit \
xorg-server-xvfb \
@@ -23,6 +20,18 @@ RUN pacman -Suyy --noconfirm \
libyaml \
xorg-xdpyinfo
+{% if not webengine %}
+RUN pacman -U --noconfirm \
+ https://archive.archlinux.org/packages/q/qt5-webkit/qt5-webkit-5.212.0alpha4-18-x86_64.pkg.tar.zst \
+ https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst
+{% endif %}
+
+{% if webengine %}
+RUN python3 -c "from PyQt5 import QtWebEngineCore, QtWebEngineWidgets"
+{% else %}
+RUN python3 -c "from PyQt5 import QtWebKit, QtWebKitWidgets"
+{% endif %}
+
RUN useradd user -u 1001 && \
mkdir /home/user && \
chown user:users /home/user