Skip to content

Commit

Permalink
Merge pull request #17 from ikifar2012/dev
Browse files Browse the repository at this point in the history
2022.6.0
  • Loading branch information
ikifar2012 committed Jun 5, 2022
2 parents 3d627f7 + 46bf229 commit 80508ad
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 12 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,11 @@ jobs:
--amd64 \
--target tdm \
--docker-user ${{ secrets.DOCKERHUB_USERNAME }} \
--docker-password ${{ secrets.DOCKERHUB_TOKEN }}
--docker-password ${{ secrets.DOCKERHUB_TOKEN }}
- name: 🚀 Dispatch Repository Updater update signal
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.DISPATCH_TOKEN }}
repository: ikifar2012/ha-addons
event-type: update
client-payload: '{"addon": "tdm"}'
7 changes: 7 additions & 0 deletions tdm/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 2022.6.0

- Update git index permissions to hopefully fix crash on start-up
- Make shellcheck happy
- Automate deployments

**Full Changelog**: https://github.com/ikifar2012/tasmota-device-manager-addon/compare/2022.5.0...2022.6.0
# 2022.5.0

- Switch to `ghcr.io`
Expand Down
2 changes: 1 addition & 1 deletion tdm/config.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Tasmota Device Manager
version: '2022.5.0'
version: '2022.6.0'
slug: tdm
description: GUI application to discover and monitor devices flashed with Tasmota
arch:
Expand Down
1 change: 1 addition & 0 deletions tdm/rootfs/etc/cont-init.d/nginx.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Configure NGINX for use with deCONZ
# ==============================================================================
Expand Down
1 change: 1 addition & 0 deletions tdm/rootfs/etc/cont-init.d/novnc.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Setup noVNC
# ==============================================================================
Expand Down
11 changes: 6 additions & 5 deletions tdm/rootfs/etc/services.d/nginx/finish
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/execlineb -S1
# shellcheck shell=bash
# ==============================================================================
# Take down the S6 supervision tree based on service exit code
# Take down the S6 supervision tree when nginx fails
# ==============================================================================
if { s6-test ${1} -ne 0 }
if { s6-test ${1} -ne 256 }

/run/s6/basedir/bin/halt
if [[ "$1" -ne 0 ]] && [[ "$1" -ne 256 ]]; then
bashio::log.warning "Halting add-on"
/run/s6/basedir/bin/halt
fi
1 change: 1 addition & 0 deletions tdm/rootfs/etc/services.d/nginx/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bashio
# shellcheck shell=bash
# ==============================================================================
# Start NGINX service
# ==============================================================================
Expand Down
11 changes: 6 additions & 5 deletions tdm/rootfs/etc/services.d/tdm/finish
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/execlineb -S1
# shellcheck shell=bash
# ==============================================================================
# Take down the S6 supervision tree based on service exit code
# Take down the S6 supervision tree when tdm fails
# ==============================================================================
if { s6-test ${1} -ne 0 }
if { s6-test ${1} -ne 256 }

/run/s6/basedir/bin/halt
if [[ "$1" -ne 0 ]] && [[ "$1" -ne 256 ]]; then
bashio::log.warning "Halting add-on"
/run/s6/basedir/bin/halt
fi
1 change: 1 addition & 0 deletions tdm/rootfs/etc/services.d/tdm/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Start TDM
# ==============================================================================
Expand Down
1 change: 1 addition & 0 deletions tdm/rootfs/etc/services.d/websockify/run
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Start ozw-admin
# ==============================================================================
Expand Down

0 comments on commit 80508ad

Please sign in to comment.