From 1d71d41f149459c1a84a4d01c5f07f589dea09aa Mon Sep 17 00:00:00 2001
From: "Stanislav Lechev [0xAF]" <af@0xAF.org>
Date: Mon, 10 Jul 2023 01:00:01 +0300
Subject: [PATCH] fix versioned build and skip caches for nightly builds

---
 docker.sh                          | 3 ++-
 docker/Dockerfiles/Dockerfile-full | 3 +++
 docker/deb_based/install-owrxp.sh  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker.sh b/docker.sh
index d60b0c58..7d9504c6 100755
--- a/docker.sh
+++ b/docker.sh
@@ -36,12 +36,13 @@ buildn () {
   #echo -ne "\n\nBuilding soapysdr image.\n\n"
   #docker build --build-arg ARCHTAG=${ARCHTAG} --build-arg PROJECT=${DH_PROJECT} -t ${DH_PROJECT}-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
 
+  GIT_HASH=$(git rev-parse --short master)
   for image in ${IMAGES}; do
     i=$(echo ${image} | rev | cut -d- -f1 | rev)
     # "openwebrx" is a special image that gets tag-aliased later on
     if [[ ! -z "${i}" && "${i}" != "${DH_PROJECT}" ]] ; then
       echo -ne "\n\nBuilding ${i} image.\n\n"
-      docker build --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
+      docker build --build-arg GIT_HASH=${GIT_HASH} --build-arg ARCHTAG=$ARCHTAG --build-arg PROJECT=${DH_PROJECT} -t ${DH_USERNAME}/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
     fi
   done
 
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 7438adb4..374f53db 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -21,6 +21,9 @@ RUN export FULL_BUILD=1 && \
 
 COPY docker/files/services/sdrplay /etc/services.d/sdrplay
 
+# this build-arg will reset the cache here, so we will have a fresh copy of the files
+ARG GIT_HASH=0
+RUN echo "$GIT_HASH" > /build-hash
 RUN date > /build-date
 RUN date +%s > /build-stamp
 
diff --git a/docker/deb_based/install-owrxp.sh b/docker/deb_based/install-owrxp.sh
index 9e214f94..d31b9d82 100755
--- a/docker/deb_based/install-owrxp.sh
+++ b/docker/deb_based/install-owrxp.sh
@@ -22,7 +22,7 @@ echo "+ Install S6 services..."
 wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
 tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
 rm s6-overlay-${PLATFORM}.tar.gz
-mv /files/services/sdrplay /etc/services.d/
+cp /files/services/sdrplay /etc/services.d/
 sed -ri 's/^python3 openwebrx.py/openwebrx/' /run.sh
 
 echo "+ Add repos and update..."