From 7948b7bfa1e344cd555ed6cf7eb96edb1d25a427 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 21:44:09 +0100
Subject: [PATCH] move openwebrx installation to the end to profit from docker
 build cache

---
 docker/Dockerfiles/Dockerfile-airspy       | 2 ++
 docker/Dockerfiles/Dockerfile-base         | 2 --
 docker/Dockerfiles/Dockerfile-full         | 2 ++
 docker/Dockerfiles/Dockerfile-hackrf       | 1 +
 docker/Dockerfiles/Dockerfile-limesdr      | 2 ++
 docker/Dockerfiles/Dockerfile-perseus      | 1 +
 docker/Dockerfiles/Dockerfile-plutosdr     | 2 ++
 docker/Dockerfiles/Dockerfile-rtlsdr       | 2 ++
 docker/Dockerfiles/Dockerfile-rtlsdr-soapy | 2 ++
 docker/Dockerfiles/Dockerfile-sdrplay      | 2 ++
 docker/Dockerfiles/Dockerfile-soapyremote  | 2 ++
 11 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index 88b4e11..d332bb5 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh &&\
     rm /install-dependencies-airspy.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 56abb80..c065768 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -9,8 +9,6 @@ ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
 
-ADD . /opt/openwebrx
-
 WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 8ba106b..e3d1add 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -19,3 +19,5 @@ RUN /install-dependencies-rtlsdr.sh &&\
 ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh &&\
     rm /install-connectors.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 8b26499..6d5d5e8 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -5,3 +5,4 @@ ADD docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
     rm /install-dependencies-hackrf.sh
 
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index ea7a050..54b7a37 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh &&\
     rm /install-dependencies-limesdr.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-perseus b/docker/Dockerfiles/Dockerfile-perseus
index fa3f912..8a3faaa 100644
--- a/docker/Dockerfiles/Dockerfile-perseus
+++ b/docker/Dockerfiles/Dockerfile-perseus
@@ -5,3 +5,4 @@ ADD docker/scripts/install-dependencies-perseus.sh /
 RUN /install-dependencies-perseus.sh &&\
     rm /install-dependencies-perseus.sh
 
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index c087960..d91e3f1 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh &&\
     rm /install-dependencies-plutosdr.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index d637393..5e24074 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -8,3 +8,5 @@ RUN /install-dependencies-rtlsdr.sh &&\
     rm /install-dependencies-rtlsdr.sh &&\
     /install-connectors.sh &&\
     rm /install-connectors.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index aeb4ef5..47de00d 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh &&\
     rm /install-dependencies-rtlsdr-soapy.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 943fb2b..eb4cf2c 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -6,3 +6,5 @@ ADD docker/scripts/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh &&\
     rm /install-dependencies-sdrplay.sh &&\
     rm /install-lib.*.patch
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index 3eef82b..312af40 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh &&\
     rm /install-dependencies-soapyremote.sh
+
+ADD . /opt/openwebrx