Merge pull request #13 from ikifar2012/dev

2022.2.0

.github/workflows/publish.yaml

@@ -23,7 +23,7 @@ jobs:
  uses: home-assistant/builder@master
  with:
  args: |
- --all \
+ --amd64 \
  --target tdm \
  --docker-user ${{ secrets.DOCKERHUB_USERNAME }} \
  --docker-password ${{ secrets.DOCKERHUB_TOKEN }}

.github/workflows/test.yaml

@@ -14,6 +14,6 @@ jobs:
  with:
  args: |
  --test \
- --all \
+ --amd64 \
  --target tdm \
  --docker-hub ikifar

tdm/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2022.2.0
+
+- Added MQTT auto configuration
+- Added `i3status`
+- Switch to `${HOME}` variable
+- Solves issue VNC config window always showing #12
+
 # 2021.12.0
 
 - Switch to i3 window manager

tdm/Dockerfile

@@ -5,7 +5,6 @@ FROM $BUILD_FROM
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Install dependencies
-ARG BUILD_ARCH
 RUN apt-get update \
  && apt-get install -y --no-install-recommends \
  curl \
@@ -29,12 +28,13 @@ RUN apt-get update \
  tigervnc-standalone-server \
  wget \
  i3 \
+ i3status \
  xfonts-base \
  xfonts-scalable \
  firefox-esr
 
 RUN apt-get install libqt5x11extras5 python3 python3-pip git -y --no-install-recommends
-RUN apt-get install libqt5gui5 zlib1g-dev gcc g++ make -y && rm -rf /var/lib/apt/lists/* 
+RUN apt-get install libqt5gui5 zlib1g-dev gcc g++ make -y && rm -rf /var/lib/apt/lists/*
 RUN python3 -m pip install --upgrade pip
 RUN python3 -m pip install wheel
 RUN python3 -m pip install pyqt5==5.14.2

tdm/config.yaml

@@ -1,12 +1,14 @@
 name: Tasmota Device Manager
-version: '2021.12.0'
+version: '2022.2.0'
 slug: tdm
 description: GUI application to discover and monitor devices flashed with Tasmota
 arch:
  - amd64
 url: https:/ikifar2012/tasmota-device-manager-addon
-startup: services
+startup: application
 boot: auto
+services:
+ - mqtt:want
 init: false
 ingress: true
 panel_icon: mdi:application-cog
@@ -18,7 +20,6 @@ ports:
  5900/tcp:
 ports_description:
  5900/tcp: TDM via VNC (Not required for Ingress. Not secure!)
-host_network: true
 options:
  debug: false
 schema:

tdm/rootfs/etc/services.d/tdm/run

@@ -5,10 +5,31 @@
 TMP_FOLDER=$(mktemp -d)
 VNC_PORT="$(bashio::addon.port 5900)"
 ARCH="$(bashio::info.arch)"
-mkdir -p /share/tdm
 DEBUG=$(bashio::config "debug")
+export HOME='/share/tdm'
+mkdir -p ${HOME}/.vnc
+(
+ echo "vncconfig --nowin &"
+ echo "exec i3"
+) > ${HOME}/.vnc/xstartup
+chmod 755 ${HOME}/.vnc/xstartup
 # ln -s /usr/lib/x86_64-linux-gnu/libxcb-util.so.0.0.0 /usr/lib/x86_64-linux-gnu/libxcb-util.so.1
-export HOME=/share/tdm
+
+# Get MQTT config
+if bashio::services.available "mqtt"; then
+ MQTT_HOST=$(bashio::services "mqtt" "host")
+ MQTT_PASSWORD=$(bashio::services "mqtt" "password")
+ MQTT_PORT=$(bashio::services "mqtt" "port")
+ MQTT_USER=$(bashio::services "mqtt" "username")
+ (
+ echo "[General]"
+ echo "connect_on_startup=true"
+ echo "hostname=${MQTT_HOST}"
+ echo "password=${MQTT_PASSWORD}"
+ echo "port=${MQTT_PORT}"
+ echo "username=${MQTT_USER}"
+ ) > ${HOME}/TDM/tdm.cfg
+fi
 # Run it only on localhost if not expose
 if bashio::var.has_value "${VNC_PORT}"; then
  bashio::log.warning "Your direct VNC access is not protected!"