From 5a21b07269e665a20d8a5507250154196db64be8 Mon Sep 17 00:00:00 2001 From: Marvin Sinister Date: Sat, 3 Jul 2021 14:46:55 +0200 Subject: [PATCH] revert package installation changes --- docker_builds/debian_bullseye/Dockerfile | 9 +-------- docker_builds/debian_bullseye/do_build.sh | 4 ++-- docker_builds/debian_buster/Dockerfile | 9 +-------- docker_builds/debian_buster/do_build.sh | 4 ++-- docker_builds/debian_sid/Dockerfile | 9 +-------- docker_builds/debian_sid/do_build.sh | 4 ++-- docker_builds/ubuntu_focal/Dockerfile | 9 +-------- docker_builds/ubuntu_focal/do_build.sh | 4 ++-- docker_builds/ubuntu_groovy/Dockerfile | 9 +-------- docker_builds/ubuntu_groovy/do_build.sh | 4 ++-- docker_builds/ubuntu_hirsute/Dockerfile | 9 +-------- docker_builds/ubuntu_hirsute/do_build.sh | 4 ++-- 12 files changed, 18 insertions(+), 60 deletions(-) diff --git a/docker_builds/debian_bullseye/Dockerfile b/docker_builds/debian_bullseye/Dockerfile index 53b6f6a1..7ed48b68 100644 --- a/docker_builds/debian_bullseye/Dockerfile +++ b/docker_builds/debian_bullseye/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh index d37a5ec3..90d56025 100644 --- a/docker_builds/debian_bullseye/do_build.sh +++ b/docker_builds/debian_bullseye/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file diff --git a/docker_builds/debian_buster/Dockerfile b/docker_builds/debian_buster/Dockerfile index 6ad32969..edaa3da2 100644 --- a/docker_builds/debian_buster/Dockerfile +++ b/docker_builds/debian_buster/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index 154b4784..7f9e145a 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file diff --git a/docker_builds/debian_sid/Dockerfile b/docker_builds/debian_sid/Dockerfile index da6d8c77..6b1dd42f 100644 --- a/docker_builds/debian_sid/Dockerfile +++ b/docker_builds/debian_sid/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh index d37a5ec3..90d56025 100644 --- a/docker_builds/debian_sid/do_build.sh +++ b/docker_builds/debian_sid/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file diff --git a/docker_builds/ubuntu_focal/Dockerfile b/docker_builds/ubuntu_focal/Dockerfile index 96655600..a382660b 100644 --- a/docker_builds/ubuntu_focal/Dockerfile +++ b/docker_builds/ubuntu_focal/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh index d37a5ec3..90d56025 100644 --- a/docker_builds/ubuntu_focal/do_build.sh +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file diff --git a/docker_builds/ubuntu_groovy/Dockerfile b/docker_builds/ubuntu_groovy/Dockerfile index a14d0281..48c5288e 100644 --- a/docker_builds/ubuntu_groovy/Dockerfile +++ b/docker_builds/ubuntu_groovy/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/ubuntu_groovy/do_build.sh b/docker_builds/ubuntu_groovy/do_build.sh index d37a5ec3..90d56025 100644 --- a/docker_builds/ubuntu_groovy/do_build.sh +++ b/docker_builds/ubuntu_groovy/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file diff --git a/docker_builds/ubuntu_hirsute/Dockerfile b/docker_builds/ubuntu_hirsute/Dockerfile index 309f8309..40c340f9 100644 --- a/docker_builds/ubuntu_hirsute/Dockerfile +++ b/docker_builds/ubuntu_hirsute/Dockerfile @@ -1,11 +1,4 @@ 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 \ No newline at end of file diff --git a/docker_builds/ubuntu_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh index d37a5ec3..90d56025 100644 --- a/docker_builds/ubuntu_hirsute/do_build.sh +++ b/docker_builds/ubuntu_hirsute/do_build.sh @@ -4,7 +4,7 @@ cd /root # Install dependencies and tools apt update -apt full-upgrade -y +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 # Install SDRPlay libraries wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run @@ -20,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 \ No newline at end of file