Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Calimero - Add discovery name in config #2

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions calimero-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@ RUN cd /opt/calimero/ \
&& rm -R org
# https://s01.oss.sonatype.org/#nexus-search;quick~io.calimero
RUN cd /opt/calimero/ \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-rxtx/3.0-SNAPSHOT/calimero-rxtx-3.0-20240209.103824-5.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-core/3.0-SNAPSHOT/calimero-core-3.0-20240209.103824-6.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-device/3.0-SNAPSHOT/calimero-device-3.0-20240209.103824-5.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-server/3.0-SNAPSHOT/calimero-server-3.0-20240209.103824-5.jar

&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-rxtx/3.0-SNAPSHOT/calimero-rxtx-3.0-20240331.030215-6.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-core/3.0-SNAPSHOT/calimero-core-3.0-20240818.140036-12.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-device/3.0-SNAPSHOT/calimero-device-3.0-20240818.140053-9.jar \
&& wget https://s01.oss.sonatype.org/service/local/repositories/snapshots/content/io/calimero/calimero-server/3.0-SNAPSHOT/calimero-server-3.0-20240818.140122-11.jar
ARG BUILD_FROM
FROM $BUILD_FROM

Expand All @@ -76,4 +75,4 @@ COPY --from=build /opt/calimero /opt/calimero
COPY run.sh /
RUN chmod a+x /run.sh

CMD [ "/run.sh" ]
CMD [ "/run.sh" ]
2 changes: 2 additions & 0 deletions calimero-server/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"uart": true,
"usb": true,
"options": {
"discovery_name": "Hass OS KNXnet/IP Server",
"knx_address": "1.1.0",
"client_address_start": "1.1.101",
"client_address_count": 5,
Expand All @@ -21,6 +22,7 @@
"knx_source_override": true
},
"schema": {
"discovery_name": "str",
"knx_address": "str",
"client_address_start": "str",
"client_address_count": "int",
Expand Down
3 changes: 2 additions & 1 deletion calimero-server/run.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/with-contenv bashio

DISCOVERY_NAME=$(bashio::config 'discovery_name')
KNX_ADDRESS=$(bashio::config 'knx_address')
CLIENT_ADDRESS_START=$(bashio::config 'client_address_start')
CLIENT_ADDRESS_COUNT=$(bashio::config 'client_address_count')
Expand Down Expand Up @@ -37,7 +38,7 @@ fi

CONFIG_XML="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!-- Calimero server settings (required for startup) -->
<knxServer name=\"knx-server\" friendlyName=\"Hass OS KNXnet/IP Server\">
<knxServer name=\"knx-server\" friendlyName=\"$DISCOVERY_NAME\">
<!-- KNXnet/IP search & discovery -->
<discovery listenNetIf=\"all\" outgoingNetIf=\"all\" activate=\"true\" />
<!-- Provides the KNXnet/IP-side configuration for access to one KNX subnet -->
Expand Down
20 changes: 0 additions & 20 deletions remote-backup/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions remote-backup/LICENSE.md

This file was deleted.

49 changes: 0 additions & 49 deletions remote-backup/README.md

This file was deleted.

32 changes: 0 additions & 32 deletions remote-backup/config.json

This file was deleted.

Binary file removed remote-backup/icon.png
Binary file not shown.
Binary file removed remote-backup/logo.png
Binary file not shown.
83 changes: 0 additions & 83 deletions remote-backup/run.sh

This file was deleted.

6 changes: 3 additions & 3 deletions repository.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "aschamberger Hass.io add-on repository",
"url": "https://github.com/aschamberger/hassio-addons",
"maintainer": "Andreas Schamberger"
"name": "George Gougoudis Hass.io add-on repository",
"url": "https://github.com/georgegougoudis/hassio-addons",
"maintainer": "George Gougoudis"
}
16 changes: 0 additions & 16 deletions snmp-trap/Dockerfile

This file was deleted.

42 changes: 0 additions & 42 deletions snmp-trap/README.md

This file was deleted.

21 changes: 0 additions & 21 deletions snmp-trap/config.json

This file was deleted.

Binary file removed snmp-trap/icon.png
Binary file not shown.
Binary file removed snmp-trap/logo.png
Binary file not shown.
9 changes: 0 additions & 9 deletions snmp-trap/run.sh

This file was deleted.

Loading