split soapysdr from the sdrplay build

build.sh

@@ -15,6 +15,7 @@ TAGS=$ARCH
 
 docker build --build-arg BASE_IMAGE=$BASE_IMAGE -t openwebrx-base:$ARCH -f docker/Dockerfiles/Dockerfile-base .
 docker build --build-arg ARCH=$ARCH -t jketterl/openwebrx-rtlsdr:$ARCH -t jketterl/openwebrx:$ARCH -f docker/Dockerfiles/Dockerfile-rtlsdr .
+docker build --build-arg ARCH=$ARCH -t openwebrx-soapysdr-base:$ARCH -f docker/Dockerfiles/Dockerfile-soapysdr .
 docker build --build-arg ARCH=$ARCH -t jketterl/openwebrx-sdrplay:$ARCH -f docker/Dockerfiles/Dockerfile-sdrplay .
 
 if [ "$ARCH" == "armv7l" ]; then

docker/Dockerfiles/Dockerfile-sdrplay

@@ -1,5 +1,5 @@
 ARG ARCH
-FROM openwebrx-base:$ARCH
+FROM openwebrx-soapysdr-base:$ARCH
 
 ADD docker/scripts/install-dependencies-sdrplay.sh /
 ADD docker/scripts/install-lib.*.patch /

docker/Dockerfiles/Dockerfile-soapysdr

@@ -0,0 +1,6 @@
+ARG ARCH
+FROM openwebrx-base:$ARCH
+
+ADD docker/scripts/install-dependencies-soapysdr.sh /
+RUN /install-dependencies-soapysdr.sh
+

docker/scripts/install-dependencies-sdrplay.sh

@@ -41,13 +41,7 @@ cd ..
 rm -rf sdrplay
 rm $BINARY
 
-git clone https://github.com/pothosware/SoapySDR
-cmakebuild SoapySDR
-
 git clone https://github.com/pothosware/SoapySDRPlay.git
 cmakebuild SoapySDRPlay
 
-git clone https://github.com/rxseger/rx_tools
-cmakebuild rx_tools
-
 apk del .build-deps

docker/scripts/install-dependencies-soapysdr.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -euxo pipefail
+
+function cmakebuild() {
+  cd $1
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+BUILD_PACKAGES="git cmake make patch wget sudo udev gcc g++"
+
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/pothosware/SoapySDR
+cmakebuild SoapySDR
+
+git clone https://github.com/rxseger/rx_tools
+cmakebuild rx_tools
+
+apk del .build-deps