From 1a020e5788eb60a52aa85f4ad8c01ad923083e99 Mon Sep 17 00:00:00 2001 From: developersteve Date: Wed, 17 Jan 2024 14:01:06 +1100 Subject: [PATCH 1/3] Update Dockerfile to include a NEO_LINK_MODE This enables the ability to change the neolink mode type using an env var so that it's not locked to RTSP but will default to RTSP if the env var is not set. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34c52ed..c262b75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,7 @@ FROM docker.io/rust:slim-bookworm AS build ARG TARGETPLATFORM ENV DEBIAN_FRONTEND=noninteractive +ENV NEO_LINK_MODE rtsp WORKDIR /usr/local/src/neolink @@ -85,6 +86,6 @@ RUN gst-inspect-1.0; \ "/usr/local/bin/neolink" --version && \ mkdir -m 0700 /root/.config/ # Location that the push notifications are cached to -CMD ["/usr/local/bin/neolink", "rtsp", "--config", "/etc/neolink.toml"] +CMD ["/usr/local/bin/neolink", "${NEO_LINK_MODE}", "--config", "/etc/neolink.toml"] ENTRYPOINT ["/entrypoint.sh"] EXPOSE 8554 From 8205b652d3681318166b1f0d7002ae4f5b6c1550 Mon Sep 17 00:00:00 2001 From: developersteve Date: Thu, 18 Jan 2024 17:36:31 +1100 Subject: [PATCH 2/3] Update Dockerfile with env vars --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index c262b75..376aa1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,6 @@ FROM docker.io/rust:slim-bookworm AS build ARG TARGETPLATFORM ENV DEBIAN_FRONTEND=noninteractive -ENV NEO_LINK_MODE rtsp - - WORKDIR /usr/local/src/neolink COPY . /usr/local/src/neolink @@ -86,6 +83,8 @@ RUN gst-inspect-1.0; \ "/usr/local/bin/neolink" --version && \ mkdir -m 0700 /root/.config/ # Location that the push notifications are cached to -CMD ["/usr/local/bin/neolink", "${NEO_LINK_MODE}", "--config", "/etc/neolink.toml"] +ENV NEO_LINK_MODE="rtsp" NEO_LINK_PORT=8554 + +CMD /usr/local/bin/neolink ${NEO_LINK_MODE} --config /etc/neolink.toml ENTRYPOINT ["/entrypoint.sh"] -EXPOSE 8554 +EXPOSE ${NEO_LINK_PORT} From fcc559885a15ae59a485279fc081e5a25263b6f6 Mon Sep 17 00:00:00 2001 From: developersteve Date: Thu, 18 Jan 2024 17:40:57 +1100 Subject: [PATCH 3/3] Update README.md with env var changes added README information about the added `NEO_LINK_MODE` and `NEO_LINK_PORT` variables --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 7d69c01..dedf71e 100644 --- a/README.md +++ b/README.md @@ -456,6 +456,10 @@ docker pull quantumentangledandy/neolink # network=host, notably macos lacks this option. docker run --network host --volume=$PWD/config.toml:/etc/neolink.toml quantumentangledandy/neolink ``` +#### Environmental Variables +There are currently 2 environmental variables available as part of the container: +- `NEO_LINK_MODE`: defaults to `"rtsp"` if not set, other options are "mqtt" or "mqtt-rtsp". +- `NEO_LINK_PORT`: defaults to `8554`, set this to your required port value. ### Image