Skip to content

Commit

Permalink
Merge branch 'dev' into disable_api_default
Browse files Browse the repository at this point in the history
  • Loading branch information
helto4real committed Jul 23, 2020
2 parents ce9715f + 797c28f commit 41c69d8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
12 changes: 8 additions & 4 deletions Docker/rootfs/etc/services.d/NetDaemonAdmin/run
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
#!/usr/bin/with-contenv bash
echo "Starting NetDaemon Admin"

cd /admin || exit 1

exec node ./host/admin.js
if [[ $NETDAEMON__ADMIN == "true" ]]
then
echo "Starting NetDaemon Admin"
cd /admin || exit 1
exec node ./host/admin.js
else
exec sleep 2147483647
fi
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN wget -qO /s6 \
\
&& git clone https://github.com/net-daemon/admin.git /admin \
&& cd /admin \
&& git checkout tags/1.2.1 \
&& git checkout tags/1.2.2 \
&& make deploy \
\
&& rm -fr /var/lib/apt/lists/* \
Expand All @@ -37,7 +37,8 @@ ENV \
HOMEASSISTANT__PORT=8123 \
HOMEASSISTANT__TOKEN=NOT_SET \
HASSCLIENT_MSGLOGLEVEL=Default \
NETDAEMON__SOURCEFOLDER=/data
NETDAEMON__SOURCEFOLDER=/data \
NETDAEMON__ADMIN=true


ENTRYPOINT ["/init"]

0 comments on commit 41c69d8

Please sign in to comment.