From 095bb616baa35577001d483d6a6c0dcf1ae17bc6 Mon Sep 17 00:00:00 2001
From: John <ebusd@ebusd.eu>
Date: Sat, 19 Feb 2022 12:16:04 +0100
Subject: [PATCH] run ebusd -V at last

---
 contrib/docker/Dockerfile          | 7 +++----
 contrib/docker/Dockerfile.release  | 7 +++----
 contrib/docker/Dockerfile.template | 7 +++----
 contrib/docker/update.sh           | 2 ++
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 1e1649ba..56823e40 100755
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -43,10 +43,9 @@ LABEL version="${EBUSD_VERSION}-${EBUSD_ARCH}-devel"
 
 COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb
 
-RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \
-    && ebusd -V \
-    && rm -f ebusd.deb \
-    && update-ca-certificates
+RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb && rm -f ebusd.deb \
+    && update-ca-certificates \
+    && ebusd -V
 
 EXPOSE 8888
 
diff --git a/contrib/docker/Dockerfile.release b/contrib/docker/Dockerfile.release
index 1262a6fc..8c66666d 100644
--- a/contrib/docker/Dockerfile.release
+++ b/contrib/docker/Dockerfile.release
@@ -43,10 +43,9 @@ LABEL version="${EBUSD_VERSION}-${EBUSD_ARCH}"
 
 ADD https://github.com/john30/ebusd/releases/download/v${EBUSD_VERSION}/ebusd-${EBUSD_VERSION}_${TARGETARCH}${TARGETVARIANT}-${EBUSD_IMAGE}_mqtt1.deb ebusd.deb
 
-RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \
-    && ebusd -V \
-    && rm -f ebusd.deb \
-    && update-ca-certificates
+RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb && rm -f ebusd.deb \
+    && update-ca-certificates \
+    && ebusd -V
 
 EXPOSE 8888
 
diff --git a/contrib/docker/Dockerfile.template b/contrib/docker/Dockerfile.template
index ed836b7f..82e7f6da 100644
--- a/contrib/docker/Dockerfile.template
+++ b/contrib/docker/Dockerfile.template
@@ -43,10 +43,9 @@ LABEL version="${EBUSD_VERSION}-${EBUSD_ARCH}%EBUSD_VERSION_VARIANT%"
 
 %EBUSD_COPYDEB%
 
-RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \
-    && ebusd -V \
-    && rm -f ebusd.deb \
-    && update-ca-certificates
+RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" %EBUSD_DEBSRC% \
+    && update-ca-certificates \
+    && ebusd -V
 
 EXPOSE 8888
 
diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh
index 99b9259a..5c8e02d8 100755
--- a/contrib/docker/update.sh
+++ b/contrib/docker/update.sh
@@ -7,6 +7,7 @@ function replaceTemplate () {
     -e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \
     -e "s#%EBUSD_UPLOAD_LINES%#${upload_lines}#g" \
     -e "s#%EBUSD_COPYDEB%#${copydeb}#g" \
+    -e "s#%EBUSD_DEBSRC%#${debsrc}#g" \
     -e "s#%EBUSD_COPYENTRY%#${copyentry}#g" \
     Dockerfile.template > "$file"
   echo "updated $file"
@@ -17,6 +18,7 @@ version_variant='-devel'
 make='RUNTEST=full ./make_debian.sh'
 upload_lines=''
 copydeb='COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb'
+debsrc='ebusd.deb \&\& rm -f ebusd.deb'
 copyentry='COPY --from=build /build/contrib/docker/docker-entrypoint.sh /'
 namesuffix=''
 replaceTemplate