integrate s6 service layer for sdrplay

This commit is contained in:
Jakob Ketterl 2020-05-24 16:00:36 +02:00
parent 048210d7da
commit 6c307d885f
9 changed files with 17 additions and 4 deletions

View File

@ -1,6 +1,10 @@
FROM debian:buster-slim FROM debian:buster-slim
ADD docker/scripts/js8call-hamlib.patch / ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
ENTRYPOINT ["/init"]
ADD docker/files/js8call/js8call-hamlib.patch /
ADD docker/scripts/install-dependencies.sh / ADD docker/scripts/install-dependencies.sh /
RUN /install-dependencies.sh && \ RUN /install-dependencies.sh && \
rm /install-dependencies.sh rm /install-dependencies.sh
@ -9,5 +13,6 @@ WORKDIR /opt/openwebrx
VOLUME /etc/openwebrx VOLUME /etc/openwebrx
ENTRYPOINT [ "/opt/openwebrx/docker/scripts/run.sh" ] ADD docker/files/services/openwebrx /etc/services.d/openwebrx
EXPOSE 8073 EXPOSE 8073

View File

@ -2,7 +2,7 @@ ARG ARCHTAG
FROM openwebrx-base:$ARCHTAG FROM openwebrx-base:$ARCHTAG
ADD docker/scripts/install-dependencies-*.sh / ADD docker/scripts/install-dependencies-*.sh /
ADD docker/scripts/install-lib.*.patch / ADD docker/files/sdrplay/install-lib.*.patch /
RUN /install-dependencies-rtlsdr.sh &&\ RUN /install-dependencies-rtlsdr.sh &&\
/install-dependencies-hackrf.sh &&\ /install-dependencies-hackrf.sh &&\
@ -21,4 +21,6 @@ ADD docker/scripts/install-connectors.sh /
RUN /install-connectors.sh &&\ RUN /install-connectors.sh &&\
rm /install-connectors.sh rm /install-connectors.sh
ADD docker/files/services/sdrplay /etc/services.d/sdrplay
ADD . /opt/openwebrx ADD . /opt/openwebrx

View File

@ -2,9 +2,11 @@ ARG ARCHTAG
FROM openwebrx-soapysdr-base:$ARCHTAG 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/files/sdrplay/install-lib.*.patch /
RUN /install-dependencies-sdrplay.sh &&\ RUN /install-dependencies-sdrplay.sh &&\
rm /install-dependencies-sdrplay.sh &&\ rm /install-dependencies-sdrplay.sh &&\
rm /install-lib.*.patch rm /install-lib.*.patch
ADD docker/files/services/sdrplay /etc/services.d/sdrplay
ADD . /opt/openwebrx ADD . /opt/openwebrx

View File

@ -0,0 +1,2 @@
#!/usr/bin/execlineb -P
/opt/openwebrx/docker/scripts/run.sh

View File

@ -0,0 +1,2 @@
#!/usr/bin/execlineb -P
/usr/local/bin/sdrplay_apiService