Merge pull request #16 from ikifar2012/dev

2023.3.3

amcrest2mqtt-addon/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 2023.3.3
+
+- Fix MQTT service not available #15
+- Temporarily switch to my own fork with dependency fix
+- Bump base image to 13.1.4
+- Fix config options
+
+**Full Changelog**: https://github.com/ikifar2012/amcrest2mqtt-addon/compare/2023.3.2...2023.3.3
+
 # 2023.3.2
 
 - Set permissions on rootfs services to executable
@@ -45,4 +54,4 @@
 
 - Initial release
 
-**Full Changelog**: https://github.com/ikifar2012/amcrest2mqtt-addon/commits/2022.1.0
+**Full Changelog**: https://github.com/ikifar2012/amcrest2mqtt-addon/commits/2022.1.0

amcrest2mqtt-addon/Dockerfile

@@ -9,7 +9,7 @@ RUN apk add --no-cache \
     python3 \
     py3-pip \
     git
-RUN git clone https://github.com/carefulcomputer/amcrest2mqtt.git
+RUN git clone -b ikifar https://github.com/ikifar2012/amcrest2mqtt.git
 # Copy data for add-on
 RUN pip install -r /amcrest2mqtt/requirements.txt
 COPY rootfs /

amcrest2mqtt-addon/build.yaml

@@ -1,10 +1,10 @@
-squash: false
-build_from:
-  aarch64: ghcr.io/hassio-addons/base/aarch64:13.1.3
-  amd64: ghcr.io/hassio-addons/base/amd64:13.1.3
-  armhf: ghcr.io/hassio-addons/base/armhf:13.1.3
-  armv7: ghcr.io/hassio-addons/base/armv7:13.1.3
-  i386: ghcr.io/hassio-addons/base/i386:13.1.3
-codenotary:
-  signer: [email protected]
+squash: false
+build_from:
+  aarch64: ghcr.io/hassio-addons/base/aarch64:13.1.4
+  amd64: ghcr.io/hassio-addons/base/amd64:13.1.4
+  armhf: ghcr.io/hassio-addons/base/armhf:13.1.4
+  armv7: ghcr.io/hassio-addons/base/armv7:13.1.4
+  i386: ghcr.io/hassio-addons/base/i386:13.1.4
+codenotary:
+  signer: [email protected]
   base_image: [email protected]

amcrest2mqtt-addon/config.yaml

@@ -1,32 +1,32 @@
 name: amcrest2mqtt
-version: 2023.3.2
+version: 2023.3.3
 slug: amcrest2mqtt-addon
 description: A Home Assistant addon for amcrest2mqtt
 url: https://github.com/ikifar2012/amcrest2mqtt-addon/blob/master/README.md
 arch:
-- armhf
-- armv7
-- aarch64
-- amd64
-- i386
+  - armhf
+  - armv7
+  - aarch64
+  - amd64
+  - i386
 image: ikifar/amcrest2mqtt-addon-{arch}
 codenotary: [email protected]
 startup: services
 boot: auto
 init: false
 map:
-- ssl:ro
+  - ssl:ro
 services:
-- mqtt:want
+  - mqtt:need
 options:
-  amcrest_host: ''
-  amcrest_port: '80'
-  amcrest_username: 'admin'
-  amcrest_password: ''
-  storage_poll_interval: '3600'
-  device_name: ''
+  amcrest_host: ""
+  amcrest_port: 80
+  amcrest_username: "admin"
+  amcrest_password: ""
+  storage_poll_interval: 3600
+  device_name: ""
   home_assistant: true
-  home_assistant_prefix: ''
+  home_assistant_prefix: ""
 schema:
   amcrest_host: str
   amcrest_port: int
@@ -35,4 +35,4 @@ schema:
   storage_poll_interval: int
   device_name: str
   home_assistant: bool
-  home_assistant_prefix: str
+  home_assistant_prefix: str

amcrest2mqtt-addon/rootfs/etc/services.d/amcrest2mqtt/finish

@@ -1,4 +1,5 @@
-#!/usr/bin/env bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Take down the S6 supervision tree when amcrest2mqtt exits with an error
 # s6-overlay docs: https://github.com/just-containers/s6-overlay

amcrest2mqtt-addon/rootfs/etc/services.d/amcrest2mqtt/run

@@ -1,4 +1,5 @@
-#!/usr/bin/env bashio
+#!/command/with-contenv bashio
+# shellcheck shell=bash
 # ==============================================================================
 # Start the amcrest2mqtt service
 # s6-overlay docs: https://github.com/just-containers/s6-overlay
@@ -26,5 +27,5 @@ else
     bashio::log.warning "MQTT service not available, please ensure the MQTT Broker addon is installed and configured"
 fi
 
-cd /amcrest2mqtt/ || exit
+cd /amcrest2mqtt/ || bashio::exit.nok "Failed to change directory to /amcrest2mqtt/"
 exec /usr/bin/python3 -u src/amcrest2mqtt.py || bashio::exit.nok "Failed to start amcrest2mqtt"