From 16b3c11678ba9482c925dd29bedc81475afc56fe Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 9 Feb 2020 15:23:17 +0100
Subject: [PATCH] add soapy remote to docker build, too

---
 build.sh                                      |  1 +
 docker/Dockerfiles/Dockerfile-full            |  1 +
 docker/Dockerfiles/Dockerfile-sdrplay         |  1 +
 docker/Dockerfiles/Dockerfile-soapyremote     | 10 +++++++
 .../scripts/install-dependencies-limesdr.sh   | 14 ---------
 .../install-dependencies-soapyremote.sh       | 29 +++++++++++++++++++
 push.sh                                       |  2 +-
 7 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-soapyremote
 create mode 100755 docker/scripts/install-dependencies-soapyremote.sh

diff --git a/build.sh b/build.sh
index 69576c1..cccb5df 100755
--- a/build.sh
+++ b/build.sh
@@ -15,4 +15,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-airspy:$ARCHTAG
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr-soapy .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index e0a72f8..992fa8e 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -12,6 +12,7 @@ RUN /install-dependencies-airspy.sh
 RUN /install-dependencies-rtlsdr-soapy.sh
 RUN /install-dependencies-plutosdr.sh
 RUN /install-dependencies-limesdr.sh
+RUN /install-dependencies-soapyremote.sh
 RUN rm /install-dependencies-*.sh
 
 ADD docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index f44f53b..0013135 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -5,6 +5,7 @@ ADD docker/scripts/install-dependencies-sdrplay.sh /
 ADD docker/scripts/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh
 RUN rm /install-dependencies-sdrplay.sh
+RUN rm /install-lib.*.patch
 
 ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
new file mode 100644
index 0000000..c6e4b49
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -0,0 +1,10 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-soapyremote.sh /
+RUN /install-dependencies-soapyremote.sh
+RUN rm /install-dependencies-soapyremote.sh
+
+ADD docker/scripts/install-connectors.sh /
+RUN /install-connectors.sh
+RUN rm /install-connectors.sh
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index 6d3a093..ac92002 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-function cmakebuild() {
-  cd $1
-  if [[ ! -z "${2:-}" ]]; then
-    git checkout $2
-  fi
-  mkdir build
-  cd build
-  cmake ..
-  make
-  make install
-  cd ../..
-  rm -rf $1
-}
-
 cd /tmp
 
 STATIC_PACKAGES="libusb"
diff --git a/docker/scripts/install-dependencies-soapyremote.sh b/docker/scripts/install-dependencies-soapyremote.sh
new file mode 100755
index 0000000..9cfa2a8
--- /dev/null
+++ b/docker/scripts/install-dependencies-soapyremote.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="avahi"
+BUILD_PACKAGES="git cmake make gcc musl-dev g++ linux-headers avahi-dev"
+
+apk add --no-cache $STATIC_PACKAGES
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/pothosware/SoapyRemote.git
+cmakebuild SoapyRemote 6d9bd820da470cfe7b27b2e6946af93cfece448f
+
+apk del .build-deps
diff --git a/push.sh b/push.sh
index 915c38a..c6147e0 100755
--- a/push.sh
+++ b/push.sh
@@ -7,7 +7,7 @@ ALL_ARCHS="x86_64 armv7l aarch64"
 TAG="latest"
 ARCHTAG="$TAG-$ARCH"
 
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG