Changed S6 service run file

alex-savin · Oct 5, 2019 · 4281677 · 4281677
1 parent 6ceb58b
commit 4281677
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.4
+- Changed S6 service run file
+
 ## 0.1.3
 - Bump Live555 ProxyServer to version 2019.05.29
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-ARG BUILD_FROM
-#ARG BUILD_FROM=hassioaddons/base:5.0.1
+#ARG BUILD_FROM
+ARG BUILD_FROM=hassioaddons/base:5.0.1
 FROM $BUILD_FROM
 
 # Add env

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
     "name": "Live555 RTSP Proxy Server",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "slug": "live555",
     "description": "An RTSP Proxy Server",
     "arch": ["aarch64", "amd64", "armhf", "i386"],

diff --git a/rootfs/etc/services.d/live555proxyserver/run b/rootfs/etc/services.d/live555proxyserver/run
@@ -1,13 +1,14 @@
-#!/usr/bin/with-contenv bash
+#!/usr/bin/with-contenv bashio
 # ==============================================================================
 # SmartHouse Hass.io Add-ons: Live555 RTSP Proxy Server
 # Runs the Live555 RTSP Proxy Server
 # ==============================================================================
-source /usr/lib/hassio-addons/base.sh
 
+LOG_LEVEL=$(bashio::config 'log_level')
 CONFIG_PATH=/data/options.json
 STREAMS=$(jq --raw-output ".streams[]" $CONFIG_PATH)
 
-# Run the Live555 RTSP Proxy Server
-hass.log.info "Starting Live555 RTSP Proxy Server..."
+export LOG_LEVEL
+
+bashio::log.info "Starting Live555 RTSP Proxy Server..."
 exec live555ProxyServer ${STREAMS[*]}