From bf39b00b7f586f919a5d175dabf109c5c0fafa3f Mon Sep 17 00:00:00 2001 From: Max Winterstein Date: Fri, 9 Jun 2023 16:38:34 +0200 Subject: [PATCH] [adsb-multi-portal-feeder] Update to 1.25.0 --- adsb-multi-portal-feeder/CHANGELOG.md | 7 +++++++ adsb-multi-portal-feeder/Dockerfile | 2 -- adsb-multi-portal-feeder/build.json | 6 +++--- adsb-multi-portal-feeder/config.yaml | 11 ++++++----- .../root/etc/s6-overlay/s6-rc.d/fr24feed/run | 19 ------------------- 5 files changed, 16 insertions(+), 29 deletions(-) delete mode 100644 adsb-multi-portal-feeder/root/etc/s6-overlay/s6-rc.d/fr24feed/run diff --git a/adsb-multi-portal-feeder/CHANGELOG.md b/adsb-multi-portal-feeder/CHANGELOG.md index 76f1053..f690357 100644 --- a/adsb-multi-portal-feeder/CHANGELOG.md +++ b/adsb-multi-portal-feeder/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.25.0] - 2023-06-09 + +- This release changes to settings properties: `ULIMIT_N` and `FR24FEED_ULIMIT_N` have been renamed at upstream, they are now prefixed with `SYSTEM_`. + If you have them configured before, you might need to fix your configuration. Sorry. +- Update `thomx/fr24feed-piaware` to `1.25.0` - see [their release notes](https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/releases/tag/1.25.0) for more + + ## [1.24.0.1] - 2023-06-08 - Add missing HTML_DEFAULT_TRACKER (the typo OpenskyNetowrk is intended) - see [#149](https://github.com/MaxWinterstein/homeassistant-addons/issues/163) for more diff --git a/adsb-multi-portal-feeder/Dockerfile b/adsb-multi-portal-feeder/Dockerfile index 5601f9d..813ec81 100644 --- a/adsb-multi-portal-feeder/Dockerfile +++ b/adsb-multi-portal-feeder/Dockerfile @@ -14,8 +14,6 @@ RUN apt-get update && apt-get install -y curl jq && mkdir /tmp/bashio \ # add the options.json to environment variable magic COPY export-env-from-config.sh /export-env-from-config.sh -ADD root/etc/s6-overlay/s6-rc.d/fr24feed /etc/s6-overlay/s6-rc.d/fr24feed - RUN find /etc/s6-overlay/s6-rc.d/ -name script | xargs sed -i '1 a\source /export-env-from-config.sh' RUN find /etc/s6-overlay/s6-rc.d/ -name run | xargs sed -i '1 a\source /export-env-from-config.sh' diff --git a/adsb-multi-portal-feeder/build.json b/adsb-multi-portal-feeder/build.json index 072eb6a..1bc6551 100644 --- a/adsb-multi-portal-feeder/build.json +++ b/adsb-multi-portal-feeder/build.json @@ -1,7 +1,7 @@ { "build_from": { - "armv7": "thomx/fr24feed-piaware:1.24.0", - "aarch64": "thomx/fr24feed-piaware:1.24.0", - "amd64": "thomx/fr24feed-piaware:1.24.0" + "armv7": "thomx/fr24feed-piaware:1.25.0", + "aarch64": "thomx/fr24feed-piaware:1.25.0", + "amd64": "thomx/fr24feed-piaware:1.25.0" } } diff --git a/adsb-multi-portal-feeder/config.yaml b/adsb-multi-portal-feeder/config.yaml index f60ceb5..36fa184 100644 --- a/adsb-multi-portal-feeder/config.yaml +++ b/adsb-multi-portal-feeder/config.yaml @@ -2,7 +2,7 @@ slug: adsb-multi-portal-feeder url: https://github.com/MaxWinterstein/homeassistant-addons/ image: ghcr.io/maxwinterstein/homeassistant-adsb-multi-portal-feeder-{arch} usb: true -version: 1.24.0.1 +version: 1.25.0 arch: - armv7 - aarch64 @@ -30,8 +30,8 @@ options: HTML_SITE_LON: HOMEASSISTANT_LONGITUDE HTML_SITE_ALT: HOMEASSISTANT_ELEVATION - ULIMIT_N: 1048576 - FR24FEED_ULIMIT_N: 1024 + SYSTEM_HTTP_ULIMIT_N: 1048576 + SYSTEM_FR24FEED_ULIMIT_N: 1024 panel_icon: mdi:airplane panel_title: ADS-B Feeder @@ -107,7 +107,7 @@ schema: HTML_SITE_LON: match([+-]?(([1-9][0-9]*)|(0))([.,][0-9]+)?|HOMEASSISTANT_LONGITUDE)? HTML_SITE_ALT: match([+-]?(([1-9][0-9]*)|(0))([.,][0-9]+)?|HOMEASSISTANT_ELEVATION)? HTML_SITE_NAME: str? - HTML_DEFAULT_TRACKER: list(FlightAware|Flightradar24|Adsbexchange|Planefinder|OpenskyNetowrk)? + HTML_DEFAULT_TRACKER: list(FlightAware|Flightradar24|Adsbexchange|Planefinder|OpenskyNetwork)? HTML_RECEIVER_STATS_PAGE_FLIGHTAWARE: url? HTML_RECEIVER_STATS_PAGE_FLIGHTRADAR24: url? HTML_RECEIVER_STATS_PAGE_ADSBEXCHANGE: url? @@ -134,4 +134,5 @@ schema: LAYERS_OWM_API_KEY: str? # System - ULIMIT_N: int? + SYSTEM_HTTP_ULIMIT_N: int? + SYSTEM_FR24FEED_ULIMIT_N: int? \ No newline at end of file diff --git a/adsb-multi-portal-feeder/root/etc/s6-overlay/s6-rc.d/fr24feed/run b/adsb-multi-portal-feeder/root/etc/s6-overlay/s6-rc.d/fr24feed/run deleted file mode 100644 index 1575575..0000000 --- a/adsb-multi-portal-feeder/root/etc/s6-overlay/s6-rc.d/fr24feed/run +++ /dev/null @@ -1,19 +0,0 @@ -#!/command/with-contenv bash - -if [ "$SERVICE_ENABLE_FR24FEED" != "false" ]; then - set -eo pipefail - - # enforce ulimit like docker <=22 to prevent OOM issues - # see https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/issues/107 - if [ -n "$FR24FEED_ULIMIT_N" ]; then - echo "[fr24feed] Setting ulimit -n to $FR24FEED_ULIMIT_N" - ulimit -n "$FR24FEED_ULIMIT_N" - else - echo "[fr24feed] No adjustment of ulimit -n" - fi - - /fr24feed/fr24feed/fr24feed 2>&1 | mawk -W interactive '{printf "%c[34m[fr24feed]%c[0m %s\n", 27, 27, $0}' - # awk -W interactive ... (prefix log messages with color and "[fr24feed]") -else - tail -f /dev/null -fi \ No newline at end of file