--- a/platforms/fedora21-openssl/Dockerfile.in	Mon Aug 24 21:41:18 2015 +0200
+++ b/platforms/fedora21-openssl/Dockerfile.in	Tue Aug 25 15:30:13 2015 +0200
@@ -1,7 +1,10 @@
+.platform fedora21-openssl
 FROM fedora:21
 
 .include_if_exists ../../docker.env
 
+# do not use delta rpm because the installed
+# packages in the base image may be crippled
 #RUN yum -y install deltarpm
 RUN yum -y update
 RUN yum -y install git gcc make
@@ -11,41 +14,8 @@
 RUN yum -y install autoconf sudo less net-tools
 Run yum -y install perl-ExtUtils-Embed 
 Run yum -y install libidn-devel
-RUN yum -y install gnutls-devel gcrypt-devel
-
-# 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/fedora21/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: .
+RUN yum -y install gnutls-devel libgcrypt-devel
 
-# 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", "fedora21"]