X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=travis%2Ftravis-base-ubuntu.Dockerfile;h=ab47469124ad9d72fe2689c13f9796141b6119dd;hb=f0cea63fd5dd20c24f9cc8eb87d854b9575bce2a;hp=0ea680a9da4187da3145a415a48800aca714ff20;hpb=a24a048cc92fa31ee20638772b8333f8a8535625;p=i3%2Fi3

diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
index 0ea680a9..ab474691 100644
--- a/travis/travis-base-ubuntu.Dockerfile
+++ b/travis/travis-base-ubuntu.Dockerfile
@@ -1,7 +1,7 @@
 # vim:ft=Dockerfile
 # Same as travis-base.Dockerfile, but without the test suite dependencies since
 # we only build Debian packages on Ubuntu, we don’t run the tests.
-FROM ubuntu:wily
+FROM ubuntu:xenial
 
 RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 # Paper over occasional network flakiness of some mirrors.
@@ -25,19 +25,10 @@ RUN apt-get update && \
 
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
-RUN apt-get update && \
-    sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates && \
+RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
+    apt-get update && \
+    apt-get --allow-unauthenticated install i3-autobuild-keyring && \
+    rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
+    apt-get update && \
     DEBIAN_FRONTEND=noninteractive mk-build-deps --install --remove --tool 'apt-get --no-install-recommends -y' /usr/src/i3-debian-packaging/control && \
     rm -rf /var/lib/apt/lists/*
-
-# Install xcb-util-xrm. This is a workaround until it is available in the
-# distribution packages.
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends xutils-dev
-RUN git clone --recursive https://github.com/Airblader/xcb-util-xrm.git && \
-    cd xcb-util-xrm && \
-    ./autogen.sh --prefix=/usr && \
-    make && \
-    make install && \
-    cd -