X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=travis%2Ftravis-base-ubuntu-386.Dockerfile;h=1014407a39fcfc8bd0fb61e67594c98166f5a996;hb=c207921949440b0d7045bdf1f85c309a25bebdf0;hp=487465bedd56a6de43a6e2ca68aa3549d2c98cbf;hpb=57dc46b4ec7ee033bbb1554a2a6100e01c35d551;p=i3%2Fi3

diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile
index 487465be..1014407a 100644
--- a/travis/travis-base-ubuntu-386.Dockerfile
+++ b/travis/travis-base-ubuntu-386.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 i386, we don’t run the tests.
-FROM i386/ubuntu:wily
+FROM i386/ubuntu:xenial
 
 RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 # Paper over occasional network flakiness of some mirrors.
@@ -13,29 +13,21 @@ RUN echo 'APT::Acquire::Retries "5";' > /etc/apt/apt.conf.d/80retry
 # (3608 kB/s)). Hence, let’s stick with httpredir.debian.org (default) for now.
 
 # Install mk-build-deps (for installing the i3 build dependencies),
-# clang and clang-format-3.5 (for checking formatting and building with clang),
+# clang and clang-format-3.8 (for checking formatting and building with clang),
 # lintian (for checking spelling errors),
 RUN linux32 apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
     dpkg-dev devscripts git equivs \
-    clang clang-format-3.5 \
+    clang clang-format-3.8 \
     lintian && \
     rm -rf /var/lib/apt/lists/*
 
 # Install i3 build dependencies.
 COPY debian/control /usr/src/i3-debian-packaging/control
-RUN linux32 apt-get update && \
-    sed -i '/^\s*libxcb-xrm-dev/d' /usr/src/i3-debian-packaging/control && \
+RUN echo 'deb http://dl.bintray.com/i3/i3-autobuild-ubuntu xenial main' > /etc/apt/sources.list.d/i3-autobuild.list && \
+    linux32 apt-get update && \
+    linux32 apt-get --allow-unauthenticated install i3-autobuild-keyring && \
+    rm -f /var/lib/apt/lists/dl.bintray.com_i3_i3-autobuild-ubuntu_* && \
+    linux32 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 ca-certificates autoconf automake autotools-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 -