diff -r 06b955c7b673 -r 0d1bd8c1cf85 platforms/debian8-gnutls/Dockerfile.in
--- a/platforms/debian8-gnutls/Dockerfile.in	Mon Aug 24 21:41:18 2015 +0200
+++ b/platforms/debian8-gnutls/Dockerfile.in	Tue Aug 25 15:30:13 2015 +0200
@@ -1,6 +1,8 @@
+.platform debian8-gnutls
 FROM debian:8
 
 .include_if_exists ../../docker.env
+
 ENV DEBIAN_FRONTEND noninteractive 
 
 RUN \
@@ -9,45 +11,11 @@
  apt-get dist-upgrade -y && \
  apt-get install --no-install-recommends -y \
  git gcc make pkg-config \
- libpcre3-dev libgnutls-dev libssl-dev libdb5.3-dev libmysqlclient-dev libpq-dev \
+ libpcre3-dev libgnutls28-dev libssl-dev libdb5.3-dev libmysqlclient-dev libpq-dev \
  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
-RUN useradd --home-dir /home/eximtest -G exim -c 'Exim Test User' -m eximtest
-
-# add additional files
-# (sudoers, Local/Makefile)
-COPY platforms/debian8/root/ /
-
-# add current working copy
-COPY exim/ /home/eximtest/exim/
-
-# prepare the build - files need to be owned
-# by eximtest
-WORKDIR /home/eximtest
-RUN chown -R eximtest: .
+ less libidn11-dev libgcrypt-dev
 
-# Build Exim
-USER eximtest
-WORKDIR /home/eximtest/exim/src
-RUN make -j -l 1
-
-
-# Prepare/Build the test-suite
-WORKDIR /home/eximtest/exim/test
-RUN mkdir /tmp/exim
-RUN echo $PWD/test-config > /tmp/exim/trusted-configs
-RUN autoconf
-RUN ./configure
-RUN make
-RUN rm -f test-config
-
-## now finally run the tests
-## should be done by you, manually :)
-# -> full hostname
+.include ../../lib/*.docker
 
 ENTRYPOINT ["./runtest", "../src/build-Linux-x86_64/exim", "-FLAVOUR", "debian8"]