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

Merge branch 'Kingdread-docker-xvfb-fix'

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-17 11:15:00 +02:00
commit eabd41711e
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
misc/docker/archlinux/Dockerfile
View File

@ -3,18 +3,15 @@ MAINTAINER Florian Bruhin <me@the-compiler.org>
RUN echo 'Server = http://mirror.de.leaseweb.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist RUN echo 'Server = http://mirror.de.leaseweb.net/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist
RUN pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm archlinux-keyring RUN pacman-key --init && pacman-key --populate archlinux && pacman -Sy --noconfirm archlinux-keyring
RUN pacman -S --noconfirm pacman && pacman-db-upgrade
RUN pacman -Suyy --noconfirm RUN pacman -Suyy --noconfirm \
RUN pacman-db-upgrade
RUN pacman -S --noconfirm \
git \ git \
python-tox \ python-tox \
qt5-base \ qt5-base \
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 +20,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