From 69a5df4d668664e21e4ad0be9675222b7d74ec97 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 6 Jun 2023 04:42:41 +0800 Subject: [PATCH] [adsb-multi-portal-feeder] Update to 1.23.0 --- adsb-multi-portal-feeder/CHANGELOG.md | 7 +++++++ adsb-multi-portal-feeder/Dockerfile | 1 + adsb-multi-portal-feeder/build.json | 6 +++--- adsb-multi-portal-feeder/config.yaml | 9 ++++++++- .../root/etc/s6-overlay/s6-rc.d/fr24feed/run | 19 +++++++++++++++++++ 5 files changed, 38 insertions(+), 4 deletions(-) create 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 1b2a114..688cb8d 100644 --- a/adsb-multi-portal-feeder/CHANGELOG.md +++ b/adsb-multi-portal-feeder/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.23.0] - 2023-06-05 + +- Add default value for `ULIMIT_N` and add as configuration option, as the default was removed in the upstream - see [#119](https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/issues/119) for more +- Add new configuration option for `ulimit -n` at FR24Feed `FR24FEED_ULIMIT_N`. + Rolled the dice and deceided to start with 1024, very open for better values - see [#151](https://github.com/MaxWinterstein/homeassistant-addons/issues/151) for more +- Update `thomx/fr24feed-piaware` to `1.23.0` - see [their release notes](https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/releases/tag/1.23.0) for more + ## [1.21.0] - 2023-04-27 - Remove my memory fix and update to `1.21.0` which includes it - see [their release notes](https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/releases/tag/1.21.0) for more diff --git a/adsb-multi-portal-feeder/Dockerfile b/adsb-multi-portal-feeder/Dockerfile index 23b6ee9..5601f9d 100644 --- a/adsb-multi-portal-feeder/Dockerfile +++ b/adsb-multi-portal-feeder/Dockerfile @@ -14,6 +14,7 @@ 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 6a486fb..ab1f18f 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.21.0", - "aarch64": "thomx/fr24feed-piaware:1.21.0", - "amd64": "thomx/fr24feed-piaware:1.21.0" + "armv7": "thomx/fr24feed-piaware:1.23.0", + "aarch64": "thomx/fr24feed-piaware:1.23.0", + "amd64": "thomx/fr24feed-piaware:1.23.0" } } diff --git a/adsb-multi-portal-feeder/config.yaml b/adsb-multi-portal-feeder/config.yaml index c274db2..8332fe7 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.21.0 +version: 1.23.0 arch: - armv7 - aarch64 @@ -29,6 +29,9 @@ options: HTML_SITE_LAT: HOMEASSISTANT_LATITUDE HTML_SITE_LON: HOMEASSISTANT_LONGITUDE + ULIMIT_N: 1048576 + FR24FEED_ULIMIT_N: 1024 + panel_icon: mdi:airplane panel_title: ADS-B Feeder ports: @@ -75,6 +78,7 @@ schema: FR24FEED_LOGPATH: str? FR24FEED_MLAT: str? FR24FEED_MLAT_DASH_WITHOUT_DASH_GPS: str? + FR24FEED_ULIMIT_N: int? # ADS-B Exchange ADSBEXCHANGE_UUID: str? @@ -117,3 +121,6 @@ schema: # Open Weather Map layers LAYERS_OWM_API_KEY: str? + + # System + 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 new file mode 100644 index 0000000..1575575 --- /dev/null +++ b/adsb-multi-portal-feeder/root/etc/s6-overlay/s6-rc.d/fr24feed/run @@ -0,0 +1,19 @@ +#!/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