From 5fa8dfad23412183b559c224d158285aeb20c8a4 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@ebusd.eu>
Date: Sat, 4 Feb 2017 11:14:16 +0100
Subject: [PATCH] rebuild buildenv only if needed, move deb to runtime instead
 of copying it

---
 contrib/docker/build.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/docker/build.sh b/contrib/docker/build.sh
index adf33c44..4b354a5e 100755
--- a/contrib/docker/build.sh
+++ b/contrib/docker/build.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 set -e
-(cd buildenv && docker build -t ebusd-buildenv .)
+stamp=`docker inspect -f '{{.Created}}' ebusd-buildenv `
+if [ -z "$stamp" ] || ( rm -f .stamp && touch -d "$stamp" .stamp && [ buildenv/Dockerfile -nt .stamp ] ) ; then
+  (cd buildenv && docker build -t ebusd-buildenv .)
+fi
 docker run --rm -it -v `pwd`/../..:/build ebusd-buildenv ./make_debian.sh
 export EBUSD_VERSION=`cat ../../VERSION`
 export EBUSD_ARCH=`docker version|grep -i "Arch[^:]*server"|head -n 1|sed -e 's#^.*/##'`
-cp -a ../../ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}.deb runtime/
+mv ../../ebusd-${EBUSD_VERSION}_${EBUSD_ARCH}.deb runtime/
 (cd runtime && docker build -t ebusd .)
 echo "docker image created."
 echo