reduce layers

This commit is contained in:
Jakob Ketterl 2020-03-21 15:54:17 +01:00
parent 135e9ae7b9
commit 2505e95d1c
11 changed files with 39 additions and 39 deletions

View File

@ -2,5 +2,5 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-airspy.sh / ADD docker/scripts/install-dependencies-airspy.sh /
RUN /install-dependencies-airspy.sh RUN /install-dependencies-airspy.sh &&\
RUN rm /install-dependencies-airspy.sh rm /install-dependencies-airspy.sh

View File

@ -6,8 +6,8 @@ RUN ln -s /usr/local/lib /usr/local/lib64
ADD docker/scripts/direwolf-1.5.patch / ADD docker/scripts/direwolf-1.5.patch /
ADD docker/scripts/install-dependencies.sh / ADD docker/scripts/install-dependencies.sh /
RUN /install-dependencies.sh RUN /install-dependencies.sh && \
RUN rm /install-dependencies.sh rm /install-dependencies.sh
ADD . /opt/openwebrx ADD . /opt/openwebrx

View File

@ -4,17 +4,18 @@ FROM openwebrx-base:$ARCHTAG
ADD docker/scripts/install-dependencies-*.sh / ADD docker/scripts/install-dependencies-*.sh /
ADD docker/scripts/install-lib.*.patch / ADD docker/scripts/install-lib.*.patch /
RUN /install-dependencies-rtlsdr.sh RUN /install-dependencies-rtlsdr.sh &&\
RUN /install-dependencies-hackrf.sh /install-dependencies-hackrf.sh &&\
RUN /install-dependencies-soapysdr.sh /install-dependencies-soapysdr.sh &&\
RUN /install-dependencies-sdrplay.sh /install-dependencies-sdrplay.sh &&\
RUN /install-dependencies-airspy.sh /install-dependencies-airspy.sh &&\
RUN /install-dependencies-rtlsdr-soapy.sh /install-dependencies-rtlsdr-soapy.sh &&\
RUN /install-dependencies-plutosdr.sh /install-dependencies-plutosdr.sh &&\
RUN /install-dependencies-limesdr.sh /install-dependencies-limesdr.sh &&\
RUN /install-dependencies-soapyremote.sh /install-dependencies-soapyremote.sh &&\
RUN rm /install-dependencies-*.sh rm /install-dependencies-*.sh &&\
rm /install-libp.*.patch
ADD docker/scripts/install-connectors.sh / ADD docker/scripts/install-connectors.sh /
RUN /install-connectors.sh RUN /install-connectors.sh &&\
RUN rm /install-connectors.sh rm /install-connectors.sh

View File

@ -2,6 +2,6 @@ ARG ARCHTAG
FROM openwebrx-base:$ARCHTAG FROM openwebrx-base:$ARCHTAG
ADD docker/scripts/install-dependencies-hackrf.sh / ADD docker/scripts/install-dependencies-hackrf.sh /
RUN /install-dependencies-hackrf.sh RUN /install-dependencies-hackrf.sh &&\
RUN rm /install-dependencies-hackrf.sh rm /install-dependencies-hackrf.sh

View File

@ -2,5 +2,5 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-limesdr.sh / ADD docker/scripts/install-dependencies-limesdr.sh /
RUN /install-dependencies-limesdr.sh RUN /install-dependencies-limesdr.sh &&\
RUN rm /install-dependencies-limesdr.sh rm /install-dependencies-limesdr.sh

View File

@ -2,5 +2,5 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-plutosdr.sh / ADD docker/scripts/install-dependencies-plutosdr.sh /
RUN /install-dependencies-plutosdr.sh RUN /install-dependencies-plutosdr.sh &&\
RUN rm /install-dependencies-plutosdr.sh rm /install-dependencies-plutosdr.sh

View File

@ -2,9 +2,9 @@ ARG ARCHTAG
FROM openwebrx-base:$ARCHTAG FROM openwebrx-base:$ARCHTAG
ADD docker/scripts/install-dependencies-rtlsdr.sh / ADD docker/scripts/install-dependencies-rtlsdr.sh /
RUN /install-dependencies-rtlsdr.sh
RUN rm /install-dependencies-rtlsdr.sh
ADD docker/scripts/install-connectors.sh / ADD docker/scripts/install-connectors.sh /
RUN /install-connectors.sh
RUN rm /install-connectors.sh RUN /install-dependencies-rtlsdr.sh &&\
rm /install-dependencies-rtlsdr.sh &&\
/install-connectors.sh &&\
rm /install-connectors.sh

View File

@ -2,5 +2,5 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh / ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
RUN /install-dependencies-rtlsdr-soapy.sh RUN /install-dependencies-rtlsdr-soapy.sh &&\
RUN rm /install-dependencies-rtlsdr-soapy.sh rm /install-dependencies-rtlsdr-soapy.sh

View File

@ -3,6 +3,6 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-sdrplay.sh / ADD docker/scripts/install-dependencies-sdrplay.sh /
ADD docker/scripts/install-lib.*.patch / ADD docker/scripts/install-lib.*.patch /
RUN /install-dependencies-sdrplay.sh RUN /install-dependencies-sdrplay.sh &&\
RUN rm /install-dependencies-sdrplay.sh rm /install-dependencies-sdrplay.sh &&\
RUN rm /install-lib.*.patch rm /install-lib.*.patch

View File

@ -2,5 +2,5 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG FROM openwebrx-soapysdr-base:$ARCHTAG
ADD docker/scripts/install-dependencies-soapyremote.sh / ADD docker/scripts/install-dependencies-soapyremote.sh /
RUN /install-dependencies-soapyremote.sh RUN /install-dependencies-soapyremote.sh &&\
RUN rm /install-dependencies-soapyremote.sh rm /install-dependencies-soapyremote.sh

View File

@ -2,9 +2,8 @@ ARG ARCHTAG
FROM openwebrx-base:$ARCHTAG FROM openwebrx-base:$ARCHTAG
ADD docker/scripts/install-dependencies-soapysdr.sh / ADD docker/scripts/install-dependencies-soapysdr.sh /
RUN /install-dependencies-soapysdr.sh
RUN rm /install-dependencies-soapysdr.sh
ADD docker/scripts/install-connectors.sh / ADD docker/scripts/install-connectors.sh /
RUN /install-connectors.sh RUN /install-dependencies-soapysdr.sh &&\
RUN rm /install-connectors.sh rm /install-dependencies-soapysdr.sh &&\
/install-connectors.sh &&\
rm /install-connectors.sh