rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docker: don't start Xvfb and herbstluftwm

Browse Source 
Since we use pytest-xvfb, Xvfb is automatically started and stopped by
pytest. The herbstluftwm also runs in the "outer" Xvfb and is not
actually available inside the tests, as the tests run in another
display, while  herbstluftwm runs in :0.

This patch removes herbstluftwm completely (it was not used until now,
so there shouldn't be a problem), and doesn't start Xvfb (the package is
still needed for pytest-xvfb to work).

Additionally, it adds the "xauth" package on debian, because we'll need
it anyway sooner or later. It's automatically included in Ubuntu and
Arch because xvfb depends on it, but on debian, xauth is only
recommended and not installed automatically.
This commit is contained in:
Daniel Schadt 2016-08-16 22:36:08 +02:00
parent cc693f17ca
commit d3982f0325
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
misc/docker/archlinux/Dockerfile
View File

@ -14,7 +14,6 @@ RUN pacman -S --noconfirm \
qt5-webkit \ qt5-webkit \
python-pyqt5 \ python-pyqt5 \
xorg-xinit \ xorg-xinit \
herbstluftwm \
xorg-server-xvfb xorg-server-xvfb
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
@ -23,13 +22,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
USER user USER user
WORKDIR /home/user WORKDIR /home/user
ENV DISPLAY=:0
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD Xvfb -screen 0 800x600x24 :0 & \ CMD git clone /outside qutebrowser.git && \
sleep 2 && \
herbstluftwm & \
git clone /outside qutebrowser.git && \
cd qutebrowser.git && \ cd qutebrowser.git && \
tox -e py35 tox -e py35

8
misc/docker/debian-jessie/Dockerfile
View File

@ -11,10 +11,10 @@ RUN apt-get -y update && \
python-tox \ python-tox \
python3-sip \ python3-sip \
xvfb \ xvfb \
xauth \
git \ git \
python3-setuptools \ python3-setuptools \
wget \ wget \
herbstluftwm \
locales \ locales \
libjs-pdf libjs-pdf
RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen RUN echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen && locale-gen
@ -23,13 +23,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
USER user USER user
WORKDIR /home/user WORKDIR /home/user
ENV DISPLAY=:0
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD Xvfb -screen 0 800x600x24 :0 & \ CMD git clone /outside qutebrowser.git && \
sleep 2 && \
herbstluftwm & \
git clone /outside qutebrowser.git && \
cd qutebrowser.git && \ cd qutebrowser.git && \
tox -e py34 tox -e py34

7
misc/docker/ubuntu-xenial/Dockerfile
View File

@ -14,7 +14,6 @@ RUN apt-get -y update && \
git \ git \
python3-setuptools \ python3-setuptools \
wget \ wget \
herbstluftwm \
language-pack-en \ language-pack-en \
libjs-pdf \ libjs-pdf \
dbus dbus
@ -25,13 +24,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user
USER user USER user
WORKDIR /home/user WORKDIR /home/user
ENV DISPLAY=:0
ENV LC_ALL=en_US.UTF-8 ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD Xvfb -screen 0 800x600x24 :0 & \ CMD git clone /outside qutebrowser.git && \
sleep 2 && \
herbstluftwm & \
git clone /outside qutebrowser.git && \
cd qutebrowser.git && \ cd qutebrowser.git && \
tox -e py35 tox -e py35