diff --git a/Dockerfile b/Dockerfile index 58fdea5..392ce28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM jlesage/baseimage-gui:debian-11-v4.5.3 SHELL ["/bin/bash", "-o", "pipefail", "-c"] +# hadolint ignore=DL3008 RUN set -x && \ TEMP_PACKAGES=() && \ KEPT_PACKAGES=() && \ @@ -46,8 +47,8 @@ RUN set -x && \ apt-get update && \ apt-get install -y --no-install-recommends \ - ${KEPT_PACKAGES[@]} \ - ${TEMP_PACKAGES[@]} \ + "${KEPT_PACKAGES[@]}" \ + "${TEMP_PACKAGES[@]}" \ && \ # RTLSDR - Clone and build @@ -84,9 +85,6 @@ RUN set -x && \ set-cont-env APP_NAME "SDRReceiver" -ENV DISPLAY_WIDTH=1280 \ - DISPLAY_HEIGHT=720 - EXPOSE 5800 5900 6003 COPY rootfs/ / diff --git a/README.md b/README.md index 67d3711..b240f85 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Docker container for [SDRReceiver](https://github.com/jeroenbeijer/SDRReceiver). --- -This container is based on the absolutely fantastic [jlesage/baseimage-gui](https://hub.docker.com/r/jlesage/baseimage-gui). All the hard work has been done by them, for advanced usage I suggest you check out the [README](https://github.com/jlesage/docker-baseimage-gui/blob/master/README.md) from [jlesage/baseimage-gui](https://hub.docker.com/r/jlesage/baseimage-gui). +This container is based on the absolutely fantastic [jlesage/baseimage-gui](https://github.com/jlesage/docker-baseimage-gui). All the hard work has been done by them, for advanced usage I suggest you check out the [README](https://github.com/jlesage/docker-baseimage-gui/blob/master/README.md) from [jlesage/baseimage-gui](https://github.com/jlesage/docker-baseimage-gui). --- diff --git a/rootfs/etc/cont-init.d/50-create-config b/rootfs/etc/cont-init.d/50-create-config index 853d30f..926ee8e 100755 --- a/rootfs/etc/cont-init.d/50-create-config +++ b/rootfs/etc/cont-init.d/50-create-config @@ -1,3 +1,3 @@ #!/bin/bash -touch /${CONFIG_FILE} +touch /"${CONFIG_FILE}" diff --git a/rootfs/startapp.sh b/rootfs/startapp.sh index c318d24..3cb1e63 100755 --- a/rootfs/startapp.sh +++ b/rootfs/startapp.sh @@ -2,7 +2,7 @@ export HOME=/config -/opt/SDRReceiver/bin/SDRReceiver -s /${CONFIG_FILE} | stdbuf -o0 awk '{print "[SDRReceiver] " strftime("%Y/%m/%d %H:%M:%S", systime()) " " $0}' +exec /opt/SDRReceiver/bin/SDRReceiver -s /"${CONFIG_FILE}" sleep 10