Skip to content

Commit

Permalink
Merge pull request #103 from habuild/2024.5.1
Browse files Browse the repository at this point in the history
2024.5.1
  • Loading branch information
habuild authored May 23, 2024
2 parents dee2167 + 37e03dc commit c3d7140
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 34 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ A user of SBFspot software acknowledges that he or she is receiving this softwar

SMA, Speedwire are registered trademarks of [SMA Solar Technology AG](http://www.sma.de/en/company/about-sma.html)

[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg
[project-stage-shield]: https://img.shields.io/badge/project%20stage-production%20testing-red.svg
[release-shield]: https://img.shields.io/badge/version-2023.repo-blue.svg
[release]: https://github.com/hassio-addons/addon-ssh/tree/2023.repo
[release-shield]: https://img.shields.io/badge/version-2024.repo-blue.svg
[release]: https://github.com/hassio-addons/addon-ssh/tree/2024.repo
9 changes: 9 additions & 0 deletions haos-sbfspot/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

# ![Version](https://img.shields.io/badge/dynamic/yaml?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Fhabuild%2Fhassio-addons%2Fmain%2Fhaos-sbfspot%2Fconfig.yaml)

- Bump SPBspot to latest. Which is technically 3.9.9 due to SBFspot github setup.
- https://github.com/SBFspot/SBFspot/blob/master/SBFspot/version.h
- Bump base images to 3.19
- Bump dependencies

## ![Release][release-shield-2023-7-1]

[release-shield-2023-7-1]: https://img.shields.io/badge/version-2023.7.1-blue.svg

- Added network to apparmor capabilities for DEB12 supervised installs - issue75
- Added 14 day archive to daily archive function
- bump dependencies
Expand Down
2 changes: 1 addition & 1 deletion haos-sbfspot/DOCS.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
![Project Maintenance][maintenance-shield] [![CI](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml/badge.svg)](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml)

[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg

[![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhabuild%2Fhassio-addons)

Expand Down
42 changes: 20 additions & 22 deletions haos-sbfspot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,17 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]

# install requirements
RUN apk update && apk add --no-cache \
bluez=5.66-r5 \
bluez-dev=5.66-r5 \
boost-dev=1.82.0-r1 \
# split version in pkgs manager
curl-dev \
git=2.40.1-r0 \
g++=12.2.1_git20220924-r10 \
make=4.4.1-r1 \
mariadb-dev=10.11.4-r0\
mosquitto-clients=2.0.15-r3 \
nginx=1.24.0-r6 \
tzdata=2023c-r1
bluez=5.70-r0 \
bluez-dev=5.70-r0 \
boost-dev=1.82.0-r3 \
curl-dev=8.5.0-r0 \
git=2.43.4-r0 \
g++=13.2.1_git20231014-r0 \
make=4.4.1-r2 \
mariadb-dev=10.11.6-r0\
mosquitto-clients=2.0.18-r0 \
nginx=1.24.0-r16 \
tzdata=2024a-r0

# download and build SBFspot
WORKDIR /tmp
Expand All @@ -50,17 +49,16 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]


RUN apk update && apk add --no-cache \
bluez=5.66-r5 \
bluez=5.70-r0 \
bluez-libs=5.70-r0 \
nano=7.2-r1 \
bluez-libs=5.66-r5 \
libstdc++=12.2.1_git20220924-r10 \
mariadb-common=10.11.4-r0 \
mariadb-connector-c=3.3.5-r0 \
ncurses-libs=6.4_p20230506-r0 \
# split version in pkgs manager
libcurl \
mosquitto-clients=2.0.15-r3 \
nginx=1.24.0-r6
libstdc++=13.2.1_git20231014-r0 \
mariadb-common=10.11.6-r0 \
mariadb-connector-c=3.3.8-r0 \
ncurses-libs=6.4_p20231125-r0 \
libcurl=8.5.0-r0 \
mosquitto-clients=2.0.18-r0 \
nginx=1.24.0-r16

#tzdata=2023c-r1
#boost-date_time1.78
Expand Down
2 changes: 1 addition & 1 deletion haos-sbfspot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
![Project Maintenance][maintenance-shield] [![CI](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml/badge.svg)](https://github.com/habuild/hassio-addons/actions/workflows/addon-ci.yaml)

[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2023.svg
[maintenance-shield]: https://img.shields.io/maintenance/yes/2024.svg

[![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Fhabuild%2Fhassio-addons)

Expand Down
10 changes: 5 additions & 5 deletions haos-sbfspot/build.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
---
# https://developers.home-assistant.io/docs/add-ons/configuration#add-on-dockerfile
build_from:
aarch64: "ghcr.io/home-assistant/aarch64-base:3.18"
armhf: "ghcr.io/home-assistant/armhf-base:3.18"
armv7: "ghcr.io/home-assistant/armv7-base:3.18"
amd64: "ghcr.io/home-assistant/amd64-base:3.18"
# i386: "ghcr.io/home-assistant/i386-base:3.18"
aarch64: "ghcr.io/home-assistant/aarch64-base:3.19"
armhf: "ghcr.io/home-assistant/armhf-base:3.19"
armv7: "ghcr.io/home-assistant/armv7-base:3.19"
amd64: "ghcr.io/home-assistant/amd64-base:3.19"
# i386: "ghcr.io/home-assistant/i386-base:3.16"

labels:
org.opencontainers.image.title: "SBFspot for Home Assistant"
Expand Down
4 changes: 2 additions & 2 deletions haos-sbfspot/config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: HAOS-SBFspot
version: 2023.7.1
version: 2024.5.1
slug: haos-sbfspot
description: Manage SBFspot with a simple interface
url: "https://github.com/habuild/hassio-addons/tree/main/haos-sbfspot"
Expand All @@ -24,7 +24,7 @@ services:
- mqtt:want
options:
Connection_Type: "Bluetooth"
Sensors_HA: No
Sensors_HA: "No"
BTAddress: "!secret BTAddress"
Password: "!secret SBFpassword"
LocalBTAddress: "!secret LocalBTAddress"
Expand Down

0 comments on commit c3d7140

Please sign in to comment.