From 7c4ed6072b8143e036328d5d4ee8dcde99f8d819 Mon Sep 17 00:00:00 2001
From: Max Winterstein <MaxWinterstein@users.noreply.github.com>
Date: Thu, 27 Apr 2023 20:55:06 +0200
Subject: [PATCH] [adsb-multi-portal-feeder] Update to 1.21.0

---
 adsb-multi-portal-feeder/CHANGELOG.md | 4 +++-
 adsb-multi-portal-feeder/Dockerfile   | 3 ---
 adsb-multi-portal-feeder/build.json   | 6 +++---
 adsb-multi-portal-feeder/config.yaml  | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/adsb-multi-portal-feeder/CHANGELOG.md b/adsb-multi-portal-feeder/CHANGELOG.md
index 5f0baa6..1b2a114 100644
--- a/adsb-multi-portal-feeder/CHANGELOG.md
+++ b/adsb-multi-portal-feeder/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-**Fix for memory issues on Home Assistant OS 10 is in progress, pls wait and see [#149](https://github.com/MaxWinterstein/homeassistant-addons/issues/149) 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
 
 ## [1.20.3] - 2023-04-21
 
diff --git a/adsb-multi-portal-feeder/Dockerfile b/adsb-multi-portal-feeder/Dockerfile
index 4f2ec8d..23b6ee9 100644
--- a/adsb-multi-portal-feeder/Dockerfile
+++ b/adsb-multi-portal-feeder/Dockerfile
@@ -18,9 +18,6 @@ COPY export-env-from-config.sh /export-env-from-config.sh
 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'
 
-# Fix memory issue for e.g. HA OS 10 - see https://github.com/MaxWinterstein/homeassistant-addons/issues/149
-RUN sed -i '5 a\    ulimit -n 1048576' /etc/s6-overlay/s6-rc.d/http/run
-
 ENV TZ=UTC
 
 # Add the nice banner
diff --git a/adsb-multi-portal-feeder/build.json b/adsb-multi-portal-feeder/build.json
index a6a0b0b..6a486fb 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.20.0",
-    "aarch64": "thomx/fr24feed-piaware:1.20.0",
-    "amd64": "thomx/fr24feed-piaware:1.20.0"
+    "armv7": "thomx/fr24feed-piaware:1.21.0",
+    "aarch64": "thomx/fr24feed-piaware:1.21.0",
+    "amd64": "thomx/fr24feed-piaware:1.21.0"
   }
 }
diff --git a/adsb-multi-portal-feeder/config.yaml b/adsb-multi-portal-feeder/config.yaml
index 9640c79..c274db2 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.20.3
+version: 1.21.0
 arch:
   - armv7
   - aarch64