Skip to content

Commit

Permalink
Merge branch 'main' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
buanet committed Aug 8, 2024
2 parents dfd330b + 7257f37 commit ccb2a51
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/dependencies/.admin-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.12.0
7.0.22
2 changes: 1 addition & 1 deletion .github/dependencies/.backitup-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.9.8
3.0.16
2 changes: 1 addition & 1 deletion .github/dependencies/.discovery-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2.0
4.5.0
2 changes: 1 addition & 1 deletion .github/dependencies/.js-controller-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.17
6.0.9
2 changes: 1 addition & 1 deletion .github/dependencies/.nodejs-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
v18.20.4
4 changes: 2 additions & 2 deletions .github/workflows/version-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
curl -sL https://repo.iobroker.live/sources-dist.json | \
jq -r '."discovery".version' > .github/dependencies/.discovery-version
echo "[LOG] Fetched discovery version is $(cat .github/dependencies/.discovery-version)"
curl -sL "https://deb.nodesource.com/node_18.x/dists/bullseye/main/binary-amd64/Packages" | \
awk -F ': ' '/^Version:/ {split($2,a,"-"); print a[1]}' > .github/dependencies/.nodejs-version
curl -sL https://nodejs.org/dist/index.json | \
jq -r 'map(select(.version | startswith("v18."))) | .[0].version' > .github/dependencies/.nodejs-version
echo "[LOG] Fetched nodejs version is $(cat .github/dependencies/.nodejs-version)"
- name: Check for modified files
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Looking for documentation? :arrow_right: [docs.buanet.de](https://docs.buanet.de

### How to run the image?

You can find some basic information about the image amd how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/docs/README_docker_hub_buanet.md).
You can find some basic information about the image and how to run it on the [Docker Hub page](https://hub.docker.com/r/buanet/iobroker) or [here](https://github.com/buanet/ioBroker.docker/blob/main/docs/README_docker_hub_buanet.md).

### Is there a more detailed documentation?

Expand Down Expand Up @@ -61,11 +61,11 @@ Please do not use the issues for support questions. Not every error message is w

### Beta testing

If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. For more details and beta support join us at "beta testing & feedback" > "docker-image" at the [ioBroker Discord channel](https://discord.gg/5jGWNKnpZ8).
If you want to get the newest features and changes feel free to use/test the beta version of the Docker image. For more details and beta support join us at "beta testing & feedback" > "docker-image" at the [ioBroker Discord channel](https://discord.gg/5jGWNKnpZ8).

### Support the project

The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!<br>
The easiest way to support this project is to leave me some likes/stars on Github and Docker hub!<br>
If you want to give something back to the community, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and help me answering questions, fixing bugs or adding new features!<br>
If that doesn't work for you and you want to buy me a pizza instead, you can do this here: <a href="https://www.paypal.me/buanet" target="_blank"><img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/pp_logo.png" height="15" width="15"></a><br>
Thank you!
Expand All @@ -78,7 +78,7 @@ Moved to [CHANGELOG.md](CHANGELOG.md).

MIT License

Copyright (c) 2017-2023 André Germann
Copyright (c) 2017-2024 André Germann

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
8 changes: 5 additions & 3 deletions docs/README_docker_hub_buanet.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ New major image versions (e.g. v6, v7, v8) usually include a new major version o
It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.

### Node 18 versions
* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile)
* [`v9.1.2`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile)
* [`v9.1.1`](https://github.com/buanet/ioBroker.docker/blob/v9.1.1/debian12/Dockerfile)
* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile)
* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile)
* [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile),
* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.1/debian/node18/Dockerfile)
Expand All @@ -48,7 +50,7 @@ It is highly recommended not to use the `latest` tag for production, especially

# What is ioBroker?

IoBroker is a open source IoT platform written in JavaScript that easily connects smarthome components from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.<br>
IoBroker is an open source IoT platform written in JavaScript that easily connects smarthome components from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.<br>
All data is stored in a central database that all adapters can access. With this it is very easy to build up logical connections, automation scripts and beautiful visualizations.<br>
For further details please check out [iobroker.net](https://www.iobroker.net).

Expand Down Expand Up @@ -110,7 +112,7 @@ You could use environment variables to auto configure your ioBroker container on
* `IOB_STATESDB_TYPE` (optional, default: jsonl) Set type of ioBroker states db, could be "jsonl", "file" (deprecated) or "redis"
* `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Set host for ioBroker states db, supports comma separated list for Redis Sentinel Cluster
* `IOB_STATESDB_PORT` (optional, default: 9000) Set port for ioBroker states db, supports comma separated list for Redis Sentinel Cluster
* `IOB_STATESDB_PASS` (optional, default: 9000) Set authentication for Redis db connection
* `IOB_STATESDB_PASS` (optional) Set authentication for Redis db connection
* `IOB_STATESDB_NAME` (optional, default: mymaster) Set name for Redis Sentinel cluster db

### Activate special features:
Expand Down
10 changes: 6 additions & 4 deletions docs/README_docker_hub_iobroker.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@ New major image versions (e.g. v6, v7, v8) usually include a new major version o
It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.

### Node 18 versions
* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile)
* [`v9.1.2`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest-v9`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v9.1.2/debian12/Dockerfile)
* [`v9.1.1`](https://github.com/buanet/ioBroker.docker/blob/v9.1.1/debian12/Dockerfile)
* [`v9.1.0`](https://github.com/buanet/ioBroker.docker/blob/v9.1.0/debian12/Dockerfile)
* [`v9.0.1`](https://github.com/buanet/ioBroker.docker/blob/v9.0.1/debian12/Dockerfile)
* [`v9.0.0`](https://github.com/buanet/ioBroker.docker/blob/v9.0.0/debian12/Dockerfile)
* [`v8.1.0`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.1.0/debian/node18/Dockerfile),
Expand All @@ -51,7 +53,7 @@ It is highly recommended not to use the `latest` tag for production, especially

# What is ioBroker?

IoBroker is a open source IoT platform written in JavaScript that easily connects smarthome components from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.<br>
IoBroker is an open source IoT platform written in JavaScript that easily connects smarthome components from different manufactures. With the help of plugins (called: "adapters") ioBroker is able to communicate with a big variety of IoT hardware and services using different protocols and APIs.<br>
All data is stored in a central database that all adapters can access. With this it is very easy to build up logical connections, automation scripts and beautiful visualizations.<br>
For further details please check out [iobroker.net](https://www.iobroker.net).

Expand Down Expand Up @@ -113,7 +115,7 @@ You could use environment variables to auto configure your ioBroker container on
* `IOB_STATESDB_TYPE` (optional, default: jsonl) Set type of ioBroker states db, could be "jsonl", "file" (deprecated) or "redis"
* `IOB_STATESDB_HOST` (optional, default: 127.0.0.1) Set host for ioBroker states db, supports comma separated list for Redis Sentinel Cluster
* `IOB_STATESDB_PORT` (optional, default: 9000) Set port for ioBroker states db, supports comma separated list for Redis Sentinel Cluster
* `IOB_STATESDB_PASS` (optional, default: 9000) Set authentication for Redis db connection
* `IOB_STATESDB_PASS` (optional) Set authentication for Redis db connection
* `IOB_STATESDB_NAME` (optional, default: mymaster) Set name for Redis Sentinel cluster db

### Activate special features:
Expand Down Expand Up @@ -147,5 +149,5 @@ For more information about networking with Docker please refer to the [official

# Support the Project

If you like what you see please leave us stars and likes on our repos and join our growing community.
If you like what you see please leave us stars and likes on our repos and join our growing community.<br>
See you soon. :)

0 comments on commit ccb2a51

Please sign in to comment.