From 92e8eee60c333c4c6b79b62045ddd783b914f8b1 Mon Sep 17 00:00:00 2001 From: Schuby Date: Mon, 21 Nov 2022 11:44:27 -0800 Subject: [PATCH] App Updates and Balena Blocks Changes (#68) * Update FR24Feed Version (#3) From 1.0.29-10 to 1.0.30-3 (https://repo-feed.flightradar24.com/CHANGELOG.md) * Update MLAT Tag to latest (#4) From 0.3.9 to 0.4.2 (https://github.com/adsbxchange/mlat-client/tags). This will also match the mlat container. * Update READSB Version Newest commit: a25f8ea9c8427ad1bea82f244b7967ac8cd3153f * Update repo source file (and small typo fix) Repo source from buster to bullseye, and a small typo fix in the commented code. * Update traefik to v2.9.5 Bumped traefik to v2.9.5 (https://github.com/traefik/traefik/releases/tag/v2.9.5) * Update traefik github URL Updated the github URL for traefik * Update minimum binary used (armv6) It looks like Traefik isn't making armv5 binaries anymore. I'm not sure if this will break certain devices. Updating to armv6 * Updating URL (balenalabs) It seems that 'balenablocks' no longer works, and should now be 'balenalabs'. (see https://github.com/balena-labs-projects/browser) * Updating URL (balenalabs) It seems that 'balenablocks' no longer works, and should now be 'balenalabs'. (see https://github.com/balena-labs-projects/fbcp) * Updating URL (balenalabs) It seems that 'balenablocks' no longer works, and should now be 'balenalabs'. (see https://github.com/balena-labs-projects/wifi-connect) --- adsb-exchange/Dockerfile.template | 2 +- balena-dash/fbcp/Dockerfile | 2 +- balena-dash/kiosk/Dockerfile.template | 2 +- balena-dash/wifi-connect/Dockerfile.template | 2 +- fr24feed/Dockerfile.template | 4 ++-- radarbox/Dockerfile.template | 4 ++-- radarbox/radarbox_installer.sh | 6 +++--- traefik/Dockerfile.template | 2 +- traefik/traefik_installer.sh | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/adsb-exchange/Dockerfile.template b/adsb-exchange/Dockerfile.template index 8c834ae1..a13de93e 100644 --- a/adsb-exchange/Dockerfile.template +++ b/adsb-exchange/Dockerfile.template @@ -21,7 +21,7 @@ RUN apt update && \ FROM base AS buildstep -ARG READSB_COMMIT=705816bc54747d7fa8212fa66dc4e819204d655e +ARG READSB_COMMIT=a25f8ea9c8427ad1bea82f244b7967ac8cd3153f ARG MLAT_TAG=v0.4.2 ARG TEMP_INSTALL="git build-essential debhelper libncurses5-dev zlib1g-dev python3-dev libzstd-dev" diff --git a/balena-dash/fbcp/Dockerfile b/balena-dash/fbcp/Dockerfile index d9ab6eb7..f02f5633 100644 --- a/balena-dash/fbcp/Dockerfile +++ b/balena-dash/fbcp/Dockerfile @@ -1 +1 @@ -FROM bhcr.io/balenablocks/fbcp/1.0.2 \ No newline at end of file +FROM bhcr.io/balenalabs/fbcp/1.0.2 diff --git a/balena-dash/kiosk/Dockerfile.template b/balena-dash/kiosk/Dockerfile.template index 1272c8f6..9a9fc6bf 100644 --- a/balena-dash/kiosk/Dockerfile.template +++ b/balena-dash/kiosk/Dockerfile.template @@ -1,4 +1,4 @@ -FROM bh.cr/balenablocks/browser-%%BALENA_ARCH%%/2.4.5 +FROM bh.cr/balenalabs/browser-%%BALENA_ARCH%%/2.4.5 RUN install_packages cec-utils diff --git a/balena-dash/wifi-connect/Dockerfile.template b/balena-dash/wifi-connect/Dockerfile.template index 56fdd1ab..3652c7c9 100644 --- a/balena-dash/wifi-connect/Dockerfile.template +++ b/balena-dash/wifi-connect/Dockerfile.template @@ -1 +1 @@ -FROM balenablocks/wifi-connect:%%BALENA_ARCH%% +FROM bh.cr/balenalabs/wifi-connect-%%BALENA_ARCH%% diff --git a/fr24feed/Dockerfile.template b/fr24feed/Dockerfile.template index c0c603fa..4aa91501 100644 --- a/fr24feed/Dockerfile.template +++ b/fr24feed/Dockerfile.template @@ -3,7 +3,7 @@ LABEL maintainer="https://github.com/ketilmo" EXPOSE 8754 -ENV FR24FEED_VERSION=1.0.29-10 +ENV FR24FEED_VERSION=1.0.30-3 ENV FR24_KEY= ENV RECEIVER_HOST=dump1090-fa ENV RECEIVER_PORT=30005 @@ -38,4 +38,4 @@ RUN chmod +x /start.sh && \ chmod +x /usr/bin/fr24feed && \ rm -rf /tmp/* -ENTRYPOINT ["/usr/bin/tini", "--", "/start.sh"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/tini", "--", "/start.sh"] diff --git a/radarbox/Dockerfile.template b/radarbox/Dockerfile.template index 3c940743..64047ce4 100644 --- a/radarbox/Dockerfile.template +++ b/radarbox/Dockerfile.template @@ -19,7 +19,7 @@ RUN apt update && \ FROM base AS buildstep -ARG MLAT_TAG=v0.3.9 +ARG MLAT_TAG=v0.4.2 ARG TEMP_INSTALL="build-essential debhelper python3-dev git" RUN apt update && \ @@ -55,4 +55,4 @@ RUN mkdir -p /var/radarbox/thermal/thermal_zone0/ && \ chmod +x /showkey.sh && \ rm -rf /tmp/* -ENTRYPOINT ["/start.sh"] \ No newline at end of file +ENTRYPOINT ["/start.sh"] diff --git a/radarbox/radarbox_installer.sh b/radarbox/radarbox_installer.sh index aa048198..4736e39c 100644 --- a/radarbox/radarbox_installer.sh +++ b/radarbox/radarbox_installer.sh @@ -8,12 +8,12 @@ apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D043681 /bin/rm -f /etc/apt/sources.list.d/rb24.list # Create a new debian repository source file -echo 'deb https://apt.rb24.com/ buster main' > /etc/apt/sources.list.d/rb24.list +echo 'deb https://apt.rb24.com/ bullseye main' > /etc/apt/sources.list.d/rb24.list arch="$(dpkg --print-architecture)" echo System Architecture: $arch -# If host architecture is i386, amd64, or arm6 install armhf-version of RadarBox and run it throug software emulation. +# If host architecture is i386, amd64, or arm6 install armhf-version of RadarBox and run it through software emulation. if [ "$arch" = "i386" ] || [ "$arch" = "amd64" ]; then dpkg --add-architecture armhf apt update && apt install -y --no-install-recommends \ @@ -29,4 +29,4 @@ else fi apt clean && apt autoclean && apt autoremove && \ - rm -rf /var/lib/apt/lists/* \ No newline at end of file + rm -rf /var/lib/apt/lists/* diff --git a/traefik/Dockerfile.template b/traefik/Dockerfile.template index 793b241c..693fb6aa 100644 --- a/traefik/Dockerfile.template +++ b/traefik/Dockerfile.template @@ -12,7 +12,7 @@ RUN apt update && \ FROM base AS buildstep -ARG TRAEFIK_VERSION=2.9.1 +ARG TRAEFIK_VERSION=2.9.5 ARG TEMP_INSTALL="wget" COPY traefik_installer.sh /tmp diff --git a/traefik/traefik_installer.sh b/traefik/traefik_installer.sh index 7f17ed6c..b113a712 100644 --- a/traefik/traefik_installer.sh +++ b/traefik/traefik_installer.sh @@ -9,9 +9,9 @@ if [ "$arch" = "arm64" ]; then elif [ "$arch" = "amd64" ]; then traefik_arch="amd64" else - traefik_arch="armv5" + traefik_arch="armv6" fi traefik_packet="traefik_v${TRAEFIK_VERSION}_linux_$traefik_arch.tar.gz" -cd /tmp/ && wget --quiet -O traefik.tar.gz "https://github.com/containous/traefik/releases/download/v${TRAEFIK_VERSION}/$traefik_packet"; \ No newline at end of file +cd /tmp/ && wget --quiet -O traefik.tar.gz "https://github.com/traefik/traefik/releases/download/v${TRAEFIK_VERSION}/$traefik_packet";