--- a/.dockerignore	Wed Apr 08 21:59:47 2015 +0200
+++ b/.dockerignore	Tue Apr 14 23:36:09 2015 +0200
@@ -1,1 +1,2 @@
 #exim/.git
+exim/src/build-Linux-*/

--- a/README	Wed Apr 08 21:59:47 2015 +0200
+++ b/README	Tue Apr 14 23:36:09 2015 +0200
@@ -20,6 +20,12 @@
 This command should create some docker images, called
 =eximtest/<platform>=.
 
+== Configure the test binary
+
+If you have a custom build config (EDITME), place it in
+exim/src/Local/Makefile, as usual. Otherwise we'll use a standard
+configuration.
+
 == Run the tests
 
     docker run -i -t -h foo.site eximtest/<platform>
@@ -38,4 +44,3 @@
     5601    debian7 opensuse
     0548    fedora21
 
-

--- a/build	Wed Apr 08 21:59:47 2015 +0200
+++ b/build	Tue Apr 14 23:36:09 2015 +0200
@@ -1,4 +1,6 @@
 #!/bin/bash
+
+trap '[[ $SORRY ]] && echo "FAILED: $SORRY" >&2' EXIT
 make -C platforms
 set -e
 test -d exim || {
@@ -10,6 +12,7 @@
 do
     context=${dockerfile%/*}
     system=${context#*/}
-    echo docker build -f $dockerfile -t eximtest/$system 
+    SORRY="build for $system"
     docker build -f $dockerfile -t eximtest/$system .
+    SORRY=
 done

--- a/platforms/debian7/Dockerfile.in	Wed Apr 08 21:59:47 2015 +0200
+++ b/platforms/debian7/Dockerfile.in	Tue Apr 14 23:36:09 2015 +0200
@@ -14,6 +14,7 @@
  libsqlite3-dev libldap2-dev libperl-dev autoconf \
  sudo net-tools \
  less
+RUN apt-get install --no-install-recommends -y libidn11-dev
 
 # prepare user environment for running (exim) and testing exim (eximtest)
 RUN useradd --system -c 'Exim User' exim

--- a/platforms/debian8/Dockerfile.in	Wed Apr 08 21:59:47 2015 +0200
+++ b/platforms/debian8/Dockerfile.in	Tue Apr 14 23:36:09 2015 +0200
@@ -13,6 +13,7 @@
  libsqlite3-dev libldap2-dev libperl-dev autoconf \
  sudo net-tools \
  less
+RUN apt-get install --no-install-recommends -y libidn11-dev
 
 # prepare user environment for running (exim) and testing exim (eximtest)
 RUN useradd --system -c 'Exim User' exim

--- a/platforms/fedora21/Dockerfile.in	Wed Apr 08 21:59:47 2015 +0200
+++ b/platforms/fedora21/Dockerfile.in	Tue Apr 14 23:36:09 2015 +0200
@@ -10,6 +10,7 @@
 RUN yum -y install sqlite-devel openldap-devel perl-devel 
 RUN yum -y install autoconf sudo less net-tools
 Run yum -y install perl-ExtUtils-Embed 
+Run yum -y install libidn-devel
 
 # prepare user environment for running (exim) and testing exim (eximtest)
 RUN useradd --system -c 'Exim User' exim

--- a/platforms/opensuse/Dockerfile.in	Wed Apr 08 21:59:47 2015 +0200
+++ b/platforms/opensuse/Dockerfile.in	Tue Apr 14 23:36:09 2015 +0200
@@ -9,6 +9,7 @@
 RUN zypper -n install --no-recommends mysql-devel postgresql-devel 
 RUN zypper -n install --no-recommends sqlite-devel openldap2-devel 
 RUN zypper -n install --no-recommends autoconf sudo less net-tools
+RUN zypper -n install --no-recommends libidn-devel
 
 # prepare user environment for running (exim) and testing exim (eximtest)
 RUN groupadd --system exim

--- a/platforms/opensuse/root/home/eximtest/exim/src/Local/Makefile	Wed Apr 08 21:59:47 2015 +0200
+++ b/platforms/opensuse/root/home/eximtest/exim/src/Local/Makefile	Tue Apr 14 23:36:09 2015 +0200
@@ -363,7 +363,7 @@
 #
 # You do not need to use this for any lookup information added via pkg-config.
 
-LOOKUP_INCLUDE=-I /usr/include/mysql -I /usr/include/pgsql
+LOOKUP_INCLUDE=-I /usr/include/mysql -I /usr/include/pgsql 
 LOOKUP_LIBS=-L/usr/local/lib -L/usr/lib64/mysql -lldap -llber -lmysqlclient -lpq -lsqlite3