From d3982f032567b16f7b7dcd1a0a62fd4ba83af1af Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Tue, 16 Aug 2016 22:36:08 +0200 Subject: [PATCH 1/3] docker: don't start Xvfb and herbstluftwm 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. --- misc/docker/archlinux/Dockerfile | 7 +------ misc/docker/debian-jessie/Dockerfile | 8 ++------ misc/docker/ubuntu-xenial/Dockerfile | 7 +------ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/misc/docker/archlinux/Dockerfile b/misc/docker/archlinux/Dockerfile index 273bdb134..ac4670f9e 100644 --- a/misc/docker/archlinux/Dockerfile +++ b/misc/docker/archlinux/Dockerfile @@ -14,7 +14,6 @@ RUN pacman -S --noconfirm \ qt5-webkit \ python-pyqt5 \ xorg-xinit \ - herbstluftwm \ xorg-server-xvfb 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 WORKDIR /home/user -ENV DISPLAY=:0 ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 -CMD Xvfb -screen 0 800x600x24 :0 & \ - sleep 2 && \ - herbstluftwm & \ - git clone /outside qutebrowser.git && \ +CMD git clone /outside qutebrowser.git && \ cd qutebrowser.git && \ tox -e py35 diff --git a/misc/docker/debian-jessie/Dockerfile b/misc/docker/debian-jessie/Dockerfile index 080346fbf..43acb6aef 100644 --- a/misc/docker/debian-jessie/Dockerfile +++ b/misc/docker/debian-jessie/Dockerfile @@ -11,10 +11,10 @@ RUN apt-get -y update && \ python-tox \ python3-sip \ xvfb \ + xauth \ git \ python3-setuptools \ wget \ - herbstluftwm \ locales \ libjs-pdf 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 WORKDIR /home/user -ENV DISPLAY=:0 ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 -CMD Xvfb -screen 0 800x600x24 :0 & \ - sleep 2 && \ - herbstluftwm & \ - git clone /outside qutebrowser.git && \ +CMD git clone /outside qutebrowser.git && \ cd qutebrowser.git && \ tox -e py34 diff --git a/misc/docker/ubuntu-xenial/Dockerfile b/misc/docker/ubuntu-xenial/Dockerfile index 0d012a87d..808f1d84d 100644 --- a/misc/docker/ubuntu-xenial/Dockerfile +++ b/misc/docker/ubuntu-xenial/Dockerfile @@ -14,7 +14,6 @@ RUN apt-get -y update && \ git \ python3-setuptools \ wget \ - herbstluftwm \ language-pack-en \ libjs-pdf \ dbus @@ -25,13 +24,9 @@ RUN useradd user && mkdir /home/user && chown -R user:users /home/user USER user WORKDIR /home/user -ENV DISPLAY=:0 ENV LC_ALL=en_US.UTF-8 ENV LANG=en_US.UTF-8 -CMD Xvfb -screen 0 800x600x24 :0 & \ - sleep 2 && \ - herbstluftwm & \ - git clone /outside qutebrowser.git && \ +CMD git clone /outside qutebrowser.git && \ cd qutebrowser.git && \ tox -e py35 From 8a644177ca92948e71dd0ca1c6c83029c7ddd2a6 Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Tue, 16 Aug 2016 22:55:24 +0200 Subject: [PATCH 2/3] Dockerfile: Upgrade pacman early Otherwise we have a pacman without hook support which fails to e.g. run update-ca-trust after updating ca-certificates. --- misc/docker/archlinux/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/docker/archlinux/Dockerfile b/misc/docker/archlinux/Dockerfile index ac4670f9e..a5bad0b16 100644 --- a/misc/docker/archlinux/Dockerfile +++ b/misc/docker/archlinux/Dockerfile @@ -3,6 +3,7 @@ MAINTAINER Florian Bruhin 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 -S --noconfirm pacman | cat && pacman-db-upgrade RUN pacman -Suyy --noconfirm RUN pacman-db-upgrade From b6ea601f932a0112532e4b2ad4d8c528700ee65c Mon Sep 17 00:00:00 2001 From: Daniel Schadt Date: Tue, 16 Aug 2016 22:59:55 +0200 Subject: [PATCH 3/3] Dockerfile: fix pacman invocations --- misc/docker/archlinux/Dockerfile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/misc/docker/archlinux/Dockerfile b/misc/docker/archlinux/Dockerfile index a5bad0b16..186dbd432 100644 --- a/misc/docker/archlinux/Dockerfile +++ b/misc/docker/archlinux/Dockerfile @@ -3,12 +3,9 @@ MAINTAINER Florian Bruhin 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 -S --noconfirm pacman | cat && pacman-db-upgrade +RUN pacman -S --noconfirm pacman && pacman-db-upgrade -RUN pacman -Suyy --noconfirm -RUN pacman-db-upgrade - -RUN pacman -S --noconfirm \ +RUN pacman -Suyy --noconfirm \ git \ python-tox \ qt5-base \