From 060371c856eb5b9fb5999cb2ec4fad75f5879fbe Mon Sep 17 00:00:00 2001 From: egguy Date: Tue, 7 Feb 2023 14:05:58 +1100 Subject: [PATCH] Corrected Dockerbuild. Add new parameter from 2.7.8 Closing #6 --- grott-current/Dockerfile | 2 +- grott-current/config.json | 80 ++++++++++++++++++++------------------- grott/Dockerfile | 2 +- grott/config.json | 80 ++++++++++++++++++++------------------- 4 files changed, 86 insertions(+), 78 deletions(-) diff --git a/grott-current/Dockerfile b/grott-current/Dockerfile index 9b978ba..0a2d495 100644 --- a/grott-current/Dockerfile +++ b/grott-current/Dockerfile @@ -22,7 +22,7 @@ RUN pip3 install --no-cache --upgrade pip setuptools # Copy data for add-on COPY script.sh /app/script.sh WORKDIR /app -RUN curl -Lk 'https://github.com/johanmeijer/grott/archive/refs/heads/2.7-(Beta).zip' --output files.zip && unzip -o files.zip && rm files.zip && mv grott-*/*.py ./ +RUN curl -Lk 'https://github.com/johanmeijer/grott/archive/refs/heads/Master-(2.7.8).zip' --output files.zip && unzip -o files.zip && rm files.zip && mv grott-*/*.py ./ # Move the addon RUN curl -L 'https://raw.githubusercontent.com/egguy/grott/feature/ha-extension/examples/Home%20Assistent/grott_ha.py' -o grott_ha.py diff --git a/grott-current/config.json b/grott-current/config.json index 1635443..2e0c051 100644 --- a/grott-current/config.json +++ b/grott-current/config.json @@ -1,6 +1,6 @@ { "name": "Grott - HA extension - current", - "version": "0.0.5-current", + "version": "edge", "slug": "grott-current", "description": "The Growatt inverter monitor - current HA plugin", "url": "https://github.com/egguy/grott-home-assistant-add-on/tree/main/grott-current", @@ -32,53 +32,57 @@ "mqtt": {} }, "schema": { - "gverbose": "bool?", - "gminrecl": "int?", - "gmode": "str", - "ggrottip": "str?", - "ggrottport": "port?", "gblockcmd": "bool?", - "gnoipf": "bool?", - "gtime": "str?", - "gtimezone": "str?", - "gsendbuf": "bool?", "gcompat": "bool?", - "gvalueoffset": "int?", - "ginverterid": "str?", - "gincludeall": "bool?", - "ginvtype": "str?", "gdecrypt": "bool?", - "ggrowattip": "str?", - "ggrowattport": "port?", - "gnomqtt": "bool?", - "gmqttip": "str?", - "gmqttport": "str?", - "gmqtttopic": "str?", - "gmqttauth": "bool?", - "gmqttuser": "str?", - "gmqttpassword": "password?", - "gpvoutput": "bool?", - "gpvapikey": "str?", - "gpvsystemid": "int?", - "gpvinverters": "int?", - "ginflux": "bool?", - "ginflux2": "bool?", - "gifdbname": "str?", - "gifip": "str?", - "gifport": "port?", - "gifuser": "str?", - "gifpassword": "password?", - "giforg": "str?", - "gifbucket": "str?", - "giftoken": "str?", "gextension": "bool?", "gextname": "str?", "gextvar": "str?", + "ggrottip": "str?", + "ggrottport": "port?", + "ggrowattip": "str?", + "ggrowattport": "port?", + "gifbucket": "str?", + "gifdbname": "str?", + "gifip": "str?", + "giforg": "str?", + "gifpassword": "password?", + "gifport": "port?", + "giftoken": "str?", + "gifuser": "str?", + "gincludeall": "bool?", + "ginflux": "bool?", + "ginflux2": "bool?", + "ginverterid": "str?", + "ginvtype": "str?", "ginvtypemap": "str?", + "gminrecl": "int?", + "gmode": "str", + "gmqttauth": "bool?", + "gmqttinverterintopic": "bool?", + "gmqttip": "str?", + "gmqttpassword": "password?", + "gmqttport": "str?", + "gmqtttopic": "str?", + "gmqttuser": "str?", + "gnoipf": "bool?", + "gnomqtt": "bool?", + "gpvapikey": "str?", + "gpvdisv1": "bool?", + "gpvinverters": "int?", + "gpvoutput": "bool?", + "gpvsystemid": "int?", + "gpvtemp": "bool?", + "gsendbuf": "bool?", + "gtime": "str?", + "gtimezone": "str?", + "gvalueoffset": "int?", + "gverbose": "bool?", "mqtt": { "server": "str?", "user": "str?", "password": "str?" } - } + }, + "image": "egguy/addon-{arch}-grott-ha-addon-edge" } diff --git a/grott/Dockerfile b/grott/Dockerfile index a0418a0..2641ee2 100644 --- a/grott/Dockerfile +++ b/grott/Dockerfile @@ -22,7 +22,7 @@ RUN pip3 install --no-cache --upgrade pip setuptools # Copy data for add-on COPY script.sh /app/script.sh WORKDIR /app -RUN curl -Lk 'https://github.com/johanmeijer/grott/archive/refs/heads/2.7-(Beta).zip' --output files.zip && unzip -o files.zip && rm files.zip && mv grott-*/*.py ./ +RUN curl -Lk 'https://github.com/johanmeijer/grott/archive/refs/heads/Master-(2.7.8).zip' --output files.zip && unzip -o files.zip && rm files.zip && mv grott-*/*.py ./ # Move the addon RUN mv grott-*/examples/Home\ Assistent/grott_ha.py ./ diff --git a/grott/config.json b/grott/config.json index bfced1f..d66244d 100644 --- a/grott/config.json +++ b/grott/config.json @@ -1,6 +1,6 @@ { "name": "Grott - HA extension", - "version": "2.7.7", + "version": "2.7.8", "slug": "grott", "description": "The Growatt inverter monitor", "url": "https://github.com/johanmeijer/grott", @@ -27,53 +27,57 @@ "mqtt": {} }, "schema": { - "gverbose": "bool?", - "gminrecl": "int?", - "gmode": "str", - "ggrottip": "str?", - "ggrottport": "port?", "gblockcmd": "bool?", - "gnoipf": "bool?", - "gtime": "str?", - "gtimezone": "str?", - "gsendbuf": "bool?", "gcompat": "bool?", - "gvalueoffset": "int?", - "ginverterid": "str?", - "gincludeall": "bool?", - "ginvtype": "str?", "gdecrypt": "bool?", - "ggrowattip": "str?", - "ggrowattport": "port?", - "gnomqtt": "bool?", - "gmqttip": "str?", - "gmqttport": "str?", - "gmqtttopic": "str?", - "gmqttauth": "bool?", - "gmqttuser": "str?", - "gmqttpassword": "password?", - "gpvoutput": "bool?", - "gpvapikey": "str?", - "gpvsystemid": "int?", - "gpvinverters": "int?", - "ginflux": "bool?", - "ginflux2": "bool?", - "gifdbname": "str?", - "gifip": "str?", - "gifport": "port?", - "gifuser": "str?", - "gifpassword": "password?", - "giforg": "str?", - "gifbucket": "str?", - "giftoken": "str?", "gextension": "bool?", "gextname": "str?", "gextvar": "str?", + "ggrottip": "str?", + "ggrottport": "port?", + "ggrowattip": "str?", + "ggrowattport": "port?", + "gifbucket": "str?", + "gifdbname": "str?", + "gifip": "str?", + "giforg": "str?", + "gifpassword": "password?", + "gifport": "port?", + "giftoken": "str?", + "gifuser": "str?", + "gincludeall": "bool?", + "ginflux": "bool?", + "ginflux2": "bool?", + "ginverterid": "str?", + "ginvtype": "str?", "ginvtypemap": "str?", + "gminrecl": "int?", + "gmode": "str", + "gmqttauth": "bool?", + "gmqttinverterintopic": "bool?", + "gmqttip": "str?", + "gmqttpassword": "password?", + "gmqttport": "str?", + "gmqtttopic": "str?", + "gmqttuser": "str?", + "gnoipf": "bool?", + "gnomqtt": "bool?", + "gpvapikey": "str?", + "gpvdisv1": "bool?", + "gpvinverters": "int?", + "gpvoutput": "bool?", + "gpvsystemid": "int?", + "gpvtemp": "bool?", + "gsendbuf": "bool?", + "gtime": "str?", + "gtimezone": "str?", + "gvalueoffset": "int?", + "gverbose": "bool?", "mqtt": { "server": "str?", "user": "str?", "password": "str?" } - } + }, + "image": "egguy/addon-{arch}-grott-ha-addon" } \ No newline at end of file