diff --git a/eufy-ha-mqtt-bridge/CHANGELOG.md b/eufy-ha-mqtt-bridge/CHANGELOG.md index 334b45d..c41a3e1 100644 --- a/eufy-ha-mqtt-bridge/CHANGELOG.md +++ b/eufy-ha-mqtt-bridge/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [0.8.0] - 2021-01-10 +- Switch from `main` branch to releases from `eufy-ha-mqtt-bridge` +- Update `eufy-ha-mqtt-bridge` to `0.2.0` [Changelog](https://github.com/matijse/eufy-ha-mqtt-bridge/releases) + ## [0.7.0] - 2021-01-05 - Moved to dockerhub located images - Updated logo diff --git a/eufy-ha-mqtt-bridge/Dockerfile b/eufy-ha-mqtt-bridge/Dockerfile index 5155270..8392554 100644 --- a/eufy-ha-mqtt-bridge/Dockerfile +++ b/eufy-ha-mqtt-bridge/Dockerfile @@ -1,3 +1,4 @@ # sneaky trick to get around the requirement of {arch}-variabe based docker repositories FROM maxwinterstein/homeassistant-addon-eufy-ha-mqtt-bridge:latest + diff --git a/eufy-ha-mqtt-bridge/Dockerfile-real b/eufy-ha-mqtt-bridge/Dockerfile-real index 69ec454..0da740e 100644 --- a/eufy-ha-mqtt-bridge/Dockerfile-real +++ b/eufy-ha-mqtt-bridge/Dockerfile-real @@ -1,20 +1,18 @@ FROM hassioaddons/debian-base ENV LANG C.UTF-8 +ARG VERSION=0.2.0 + # install node and build tools (needed by node-pre-gy) RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && apt install -y nodejs g++ make python -# Calls for a random number to bust the cache -# (https://stackoverflow.com/questions/35134713/disable-cache-for-specific-run-commands/58801213#58801213) -ADD "https://www.random.org/cgi-bin/randbyte?nbytes=10&format=h" skipcache - # add source and unpack -ADD "https://github.com/matijse/eufy-ha-mqtt-bridge/tarball/main" /src.tar.gz +ADD "https://github.com/matijse/eufy-ha-mqtt-bridge/archive/${VERSION}.tar.gz" /src.tar.gz RUN mkdir /app && tar xvfz /src.tar.gz -C /app --strip-components=1 # install all (and json2yaml for cofiguration parsing) WORKDIR /app -RUN npm install && npm install -g json2yaml +RUN npm install && npm install -g json2yaml && echo ${VERSION} > /version COPY run.sh / RUN chmod a+x /run.sh diff --git a/eufy-ha-mqtt-bridge/README.md b/eufy-ha-mqtt-bridge/README.md index 67b6b01..95690ba 100644 --- a/eufy-ha-mqtt-bridge/README.md +++ b/eufy-ha-mqtt-bridge/README.md @@ -5,15 +5,10 @@ ## 🚨 This is some experimental release! 🚨 --- -**The underlaying docker image will be build every night until there is some kind of versioning available.** -**If a feature was released at eufy-ha-mqtt-bridge, it might be available as recently as the next day.** - Quick wrapp around https://github.com/matijse/eufy-ha-mqtt-bridge. Application data will be written to `/share/eufy-ha-mqtt-bridge/` so log and other files can be accessed from other addons, e.g. the `Samba share` addon, or view it at the `Visual Studio Code` add-on. -As there is currently no real versioning you might want to hit the `REBUILD` button from time to time, to ensure you got the latest version. - 🚨 This also contains some plaintext configuration file with login credentials, so take care who can access your files! 🚨 ## ♥ diff --git a/eufy-ha-mqtt-bridge/config.json b/eufy-ha-mqtt-bridge/config.json index 096a48a..f840c09 100644 --- a/eufy-ha-mqtt-bridge/config.json +++ b/eufy-ha-mqtt-bridge/config.json @@ -1,6 +1,6 @@ { "name": "Eufy Home Assistant MQTT Bridge", - "version": "0.7.0", + "version": "1.0.0", "slug": "eufy-ha-mqtt-bridge", "description": "Publish events as MQTT messages", "arch": [ diff --git a/eufy-ha-mqtt-bridge/run.sh b/eufy-ha-mqtt-bridge/run.sh index 2b1f129..0b1d7cf 100644 --- a/eufy-ha-mqtt-bridge/run.sh +++ b/eufy-ha-mqtt-bridge/run.sh @@ -13,7 +13,7 @@ echo '# Generated by homeassistant, do not edit!' > /app/data/config.yml echo '# Edit configuration only at the Add-on configuration tab!' >> /app/data/config.yml json2yml /data/options.json >> /app/data/config.yml -bashio::log.info "Build with sources downloaded on: $(stat -c %z /src.tar.gz)" +bashio::log.info "Image build with version $(cat /version)" bashio::log.info "starting original stuff..." npm run start \ No newline at end of file