Update to THOM-X/fr24Feed-Piaware 1.10.1 with ADSBEXCHANGE Support

This commit is contained in:
Delta1977
2022-03-18 12:47:35 +01:00
committed by Max Winterstein
parent af70c3eb11
commit 7a77832eae
2 changed files with 31 additions and 9 deletions

View File

@@ -1,7 +1,7 @@
FROM thomx/fr24feed-piaware:1.8.5
FROM thomx/fr24feed-piaware:1.10.1
# add bashio (thx https://github.com/hassio-addons/addon-debian-base/blob/main/base/Dockerfile#L47)
ADD https://github.com/hassio-addons/bashio/archive/v0.13.0.tar.gz /tmp/bashio.tar.gz
ADD https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz /tmp/bashio.tar.gz
RUN apt-get update && apt-get install -y curl jq && mkdir /tmp/bashio \
&& tar zxvf \
/tmp/bashio.tar.gz \
@@ -13,10 +13,19 @@ 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
RUN find /etc/services.d/ -name run | xargs sed -i '1 a\source /export-env-from-config.sh' && \
find /etc/cont-init.d/ -type f | xargs sed -i '1 a\source /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'
ENV TZ=UTC
# Add the nice banner
ADD https://raw.githubusercontent.com/hassio-addons/addon-debian-base/v5.1.0/base/rootfs/etc/cont-init.d/00-banner.sh /etc/cont-init.d/
ADD https://raw.githubusercontent.com/hassio-addons/addon-debian-base/v5.1.0/base/rootfs/etc/cont-init.d/00-banner.sh /etc/s6-overlay/s6-rc.d/banner/
RUN mkdir -p /etc/s6-overlay/s6-rc.d/banner && \
echo "oneshot" > /etc/s6-overlay/s6-rc.d/banner/type && \
echo "/etc/s6-overlay/s6-rc.d/banner/script" > /etc/s6-overlay/s6-rc.d/banner/up && \
touch /etc/s6-overlay/s6-rc.d/user/contents.d/banner && \
mv /etc/s6-overlay/s6-rc.d/banner/00-banner.sh /etc/s6-overlay/s6-rc.d/banner/script && \
chmod +x /etc/s6-overlay/s6-rc.d/banner/script && \
sed -i '1 s/^.*$/#!\/command\/with-contenv bashio/' /etc/s6-overlay/s6-rc.d/banner/script

View File

@@ -1,12 +1,13 @@
{
"name": "ADS-B Multi-Portal Feeder",
"version": "0.1.36",
"version": "0.1.37",
"stage": "experimental",
"ximage": "maxwinterstein/homeassistant-addon-adsbmultiportalfeeder-{arch}",
"slug": "adsb-multi-portal-feeder",
"description": "Dump1090 based feeder for FlightRadar24 and FlightAware",
"url": "https://github.com/MaxWinterstein/homeassistant-addons/",
"ingress": true,
"init": false,
"ingress_port": 8080,
"panel_title": "ADS-B Feeder",
"panel_icon": "mdi:airplane",
@@ -18,7 +19,13 @@
"PIAWARE_FEEDER_DASH_ID": "",
"SERVICE_ENABLE_PIAWARE": false,
"HTML_SITE_LAT": 50.033056,
"HTML_SITE_LON": 8.570556
"HTML_SITE_LON": 8.570556,
"SERVICE_ENABLE_ADSBEXCHANGE": false,
"ADSBEXCHANGE_UUID": "" ,
"ADSBEXCHANGE_STATION_NAME": "",
"MLAT_EXACT_LAT": 50.033056,
"MLAT_EXACT_LON": 8.570556,
"MLAT_ALTITUDE_MSL_METERS": 0
},
"schema": {
"SERVICE_ENABLE_FR24FEED": "bool",
@@ -26,7 +33,13 @@
"SERVICE_ENABLE_PIAWARE": "bool",
"PIAWARE_FEEDER_DASH_ID": "str?",
"HTML_SITE_LAT": "float?",
"HTML_SITE_LON": "float?"
"HTML_SITE_LON": "float?",
"SERVICE_ENABLE_ADSBEXCHANGE": "bool",
"ADSBEXCHANGE_UUID": "str?" ,
"ADSBEXCHANGE_STATION_NAME": "str?",
"MLAT_EXACT_LAT": "float?",
"MLAT_EXACT_LON": "float?",
"MLAT_ALTITUDE_MSL_METERS": "float?"
},
"hassio_api": false,
"usb": true,
@@ -48,4 +61,4 @@
"30004/tcp": "TCP Beast input",
"30005/tcp": "TCP Beast output"
}
}
}