From 135e9ae7b9bdaa815b00de743b16414ffc079a20 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Sat, 21 Mar 2020 15:49:22 +0100 Subject: [PATCH] compile the connector into soapy for faster builds --- docker/Dockerfiles/Dockerfile-airspy | 4 ---- docker/Dockerfiles/Dockerfile-limesdr | 4 ---- docker/Dockerfiles/Dockerfile-plutosdr | 4 ---- docker/Dockerfiles/Dockerfile-rtlsdr-soapy | 4 ---- docker/Dockerfiles/Dockerfile-sdrplay | 4 ---- docker/Dockerfiles/Dockerfile-soapyremote | 4 ---- docker/Dockerfiles/Dockerfile-soapysdr | 3 +++ 7 files changed, 3 insertions(+), 24 deletions(-) diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy index 4383d0d..1632870 100644 --- a/docker/Dockerfiles/Dockerfile-airspy +++ b/docker/Dockerfiles/Dockerfile-airspy @@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG ADD docker/scripts/install-dependencies-airspy.sh / RUN /install-dependencies-airspy.sh RUN rm /install-dependencies-airspy.sh - -ADD docker/scripts/install-connectors.sh / -RUN /install-connectors.sh -RUN rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr index dabb9c5..9a22428 100644 --- a/docker/Dockerfiles/Dockerfile-limesdr +++ b/docker/Dockerfiles/Dockerfile-limesdr @@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG ADD docker/scripts/install-dependencies-limesdr.sh / RUN /install-dependencies-limesdr.sh RUN rm /install-dependencies-limesdr.sh - -ADD docker/scripts/install-connectors.sh / -RUN /install-connectors.sh -RUN rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr index d9edda5..5a1aeef 100644 --- a/docker/Dockerfiles/Dockerfile-plutosdr +++ b/docker/Dockerfiles/Dockerfile-plutosdr @@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG ADD docker/scripts/install-dependencies-plutosdr.sh / RUN /install-dependencies-plutosdr.sh RUN rm /install-dependencies-plutosdr.sh - -ADD docker/scripts/install-connectors.sh / -RUN /install-connectors.sh -RUN rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy index 7989a6a..75a5daa 100644 --- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy +++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy @@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh / RUN /install-dependencies-rtlsdr-soapy.sh RUN rm /install-dependencies-rtlsdr-soapy.sh - -ADD docker/scripts/install-connectors.sh / -RUN /install-connectors.sh -RUN rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay index 0013135..9083a07 100644 --- a/docker/Dockerfiles/Dockerfile-sdrplay +++ b/docker/Dockerfiles/Dockerfile-sdrplay @@ -6,7 +6,3 @@ 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 -RUN rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote index c6e4b49..1c56906 100644 --- a/docker/Dockerfiles/Dockerfile-soapyremote +++ b/docker/Dockerfiles/Dockerfile-soapyremote @@ -4,7 +4,3 @@ 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/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr index 82b93e9..8cfdaeb 100644 --- a/docker/Dockerfiles/Dockerfile-soapysdr +++ b/docker/Dockerfiles/Dockerfile-soapysdr @@ -5,3 +5,6 @@ ADD docker/scripts/install-dependencies-soapysdr.sh / RUN /install-dependencies-soapysdr.sh RUN rm /install-dependencies-soapysdr.sh +ADD docker/scripts/install-connectors.sh / +RUN /install-connectors.sh +RUN rm /install-connectors.sh