docker build improvements

.github/workflows/build_all.yml

@@ -99,7 +99,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}
@@ -121,7 +121,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}
@@ -143,7 +143,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/debian_sid && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}
@@ -165,7 +165,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_focal && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}
@@ -187,7 +187,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_groovy && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}
@@ -209,7 +209,7 @@ jobs:
           run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_hirsute && docker build . --tag sdrpp_build
 
         - name: Run Container
-          run: docker run --name build --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
+          run: docker run --name build -v $GITHUB_WORKSPACE:/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
 
         - name: Recover Deb Archive
           working-directory: ${{runner.workspace}}

docker_builds/debian_bullseye/Dockerfile

@@ -1,4 +1,11 @@
 FROM debian:bullseye
+
 ENV DEBIAN_FRONTEND=noninteractive 
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/debian_bullseye/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build

docker_builds/debian_buster/Dockerfile

@@ -1,4 +1,11 @@
 FROM debian:buster
+
 ENV DEBIAN_FRONTEND=noninteractive 
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/debian_buster/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_BLADERF_SOURCE=OFF -DOPT_BUIL
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build

docker_builds/debian_sid/Dockerfile

@@ -1,4 +1,11 @@
 FROM debian:sid
+
 ENV DEBIAN_FRONTEND=noninteractive 
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/debian_sid/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build

docker_builds/ubuntu_focal/Dockerfile

@@ -1,4 +1,11 @@
 FROM ubuntu:focal
+
 ENV DEBIAN_FRONTEND=noninteractive 
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/ubuntu_focal/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build

docker_builds/ubuntu_groovy/Dockerfile

@@ -1,4 +1,11 @@
 FROM ubuntu:groovy
+
 ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/ubuntu_groovy/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build

docker_builds/ubuntu_hirsute/Dockerfile

@@ -1,4 +1,11 @@
 FROM ubuntu:hirsute
+
 ENV DEBIAN_FRONTEND=noninteractive 
+
+RUN apt update && \
+    apt full-upgrade -y && \
+    apt install -y --no-install-recommends build-essential ca-certificates cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+
 COPY do_build.sh /root
-RUN chmod +x /root/do_build.sh
+
+RUN chmod +x /root/do_build.sh

docker_builds/ubuntu_hirsute/do_build.sh

@@ -4,7 +4,7 @@ cd /root
 
 # Install dependencies and tools
 apt update
-apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev libbladerf-dev liblimesuite-dev p7zip-full wget
+apt full-upgrade -y
 
 # Install SDRPlay libraries
 wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
@@ -13,8 +13,6 @@ wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run
 cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so
 cp inc/* /usr/include/
 
-git clone https://github.com/AlexandreRouma/SDRPlusPlus
-
 cd SDRPlusPlus
 mkdir build
 cd build
@@ -22,4 +20,4 @@ cmake .. -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD
 make -j2
 
 cd ..
-sh make_debian_package.sh ./build
+sh make_debian_package.sh ./build