From 40db784e2b5c68696bfaaed42a7318affc564fdd Mon Sep 17 00:00:00 2001 From: Ketil Moland Olsen Date: Mon, 13 Nov 2023 15:41:32 +0100 Subject: [PATCH] Bumped FlightAware to v9.0. --- dump1090-fa/Dockerfile.template | 8 ++++---- dump978-fa/Dockerfile.template | 4 ++-- piaware/Dockerfile.template | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dump1090-fa/Dockerfile.template b/dump1090-fa/Dockerfile.template index 207758a..ac1fcbc 100644 --- a/dump1090-fa/Dockerfile.template +++ b/dump1090-fa/Dockerfile.template @@ -1,4 +1,4 @@ -FROM balenalib/%%BALENA_ARCH%%-debian:bullseye AS base +FROM balenalib/%%BALENA_ARCH%%-debian:bookworm AS base LABEL maintainer="https://github.com/ketilmo" EXPOSE 30001 30002 30003 30004 30005 30102 30104 30105 30106 8080 @@ -13,7 +13,7 @@ ENV DUMP1090_ADAPTIVE_MIN_GAIN="" ENV DUMP1090_ADAPTIVE_MAX_GAIN="" ENV DUMP1090_SLOW_CPU="" -ARG PERM_INSTALL="tini lighttpd gettext-base libusb-1.0-0 libbladerf2 libhackrf0 liblimesuite20.10-1 librtlsdr0 rtl-sdr" +ARG PERM_INSTALL="tini lighttpd gettext-base libusb-1.0-0 libbladerf2 libhackrf0 liblimesuite22.09-1 librtlsdr0 rtl-sdr libsoapysdr0.8 libncurses6" RUN apt update && \ apt install -y $PERM_INSTALL && \ @@ -22,8 +22,8 @@ RUN apt update && \ FROM base AS buildstep -ARG DUMP1090_VERSION=v8.2 -ARG TEMP_INSTALL="git build-essential cmake debhelper pkg-config libncurses5-dev libbladerf-dev libhackrf-dev liblimesuite-dev libusb-1.0-0-dev librtlsdr-dev apt-utils apt-transport-https debhelper" +ARG DUMP1090_VERSION=v9.0 +ARG TEMP_INSTALL="git build-essential fakeroot cmake debhelper pkg-config libncurses5-dev libbladerf-dev libhackrf-dev liblimesuite-dev libusb-1.0-0-dev libsoapysdr-dev librtlsdr-dev apt-utils apt-transport-https debhelper" RUN apt update && \ apt install -y $TEMP_INSTALL diff --git a/dump978-fa/Dockerfile.template b/dump978-fa/Dockerfile.template index bc501d1..a84426d 100644 --- a/dump978-fa/Dockerfile.template +++ b/dump978-fa/Dockerfile.template @@ -1,4 +1,4 @@ -FROM balenalib/%%BALENA_ARCH%%-debian:bullseye AS base +FROM balenalib/%%BALENA_ARCH%%-debian:bookworm AS base LABEL maintainer="https://github.com/ketilmo" EXPOSE 30978 30979 8978 @@ -15,7 +15,7 @@ RUN apt update && \ FROM base AS buildstep -ARG DUMP978_VERSION=v8.2 +ARG DUMP978_VERSION=v9.0 ARG TEMP_INSTALL="build-essential cmake git debhelper pkg-config libboost-system-dev libboost-regex-dev libusb-1.0-0-dev libboost-filesystem-dev libboost-program-options-dev libsoapysdr-dev librtlsdr-dev debhelper" RUN apt update && \ diff --git a/piaware/Dockerfile.template b/piaware/Dockerfile.template index 16b8532..662f3ca 100644 --- a/piaware/Dockerfile.template +++ b/piaware/Dockerfile.template @@ -1,4 +1,4 @@ -FROM balenalib/%%BALENA_ARCH%%-debian:bullseye AS base +FROM balenalib/%%BALENA_ARCH%%-debian:bookworm AS base LABEL maintainer="https://github.com/ketilmo" EXPOSE 30105 30106 @@ -9,7 +9,7 @@ ENV RECEIVER_PORT 30005 ENV RECEIVER_MLAT_PORT 30104 ENV DUMP978_ENABLED=false -ARG PERM_INSTALL="tini net-tools tclx8.4 tcllib itcl3 libboost-filesystem1.74.0 libboost-program-options1.74.0 libboost-regex1.74.0 libboost-system1.74.0 libexpat1 expect libmpdec3" +ARG PERM_INSTALL="tini net-tools tclx8.4 tcllib itcl3 libboost-filesystem1.74.0 libboost-program-options1.74.0 libboost-regex1.74.0 libboost-system1.74.0 libexpat1 expect openssl" RUN apt update && \ apt install -y $PERM_INSTALL && \ @@ -18,8 +18,8 @@ RUN apt update && \ FROM base AS buildstep -ARG PIAWARE_VERSION=v8.2 -ARG TEMP_INSTALL="wget devscripts build-essential debhelper tcl8.6-dev autoconf python3-dev python3-venv python3-setuptools patchelf debhelper libz-dev git libssl-dev tcl-dev chrpath libboost-system-dev libboost-program-options-dev libboost-regex-dev libboost-filesystem-dev" +ARG PIAWARE_VERSION=v9.0 +ARG TEMP_INSTALL="wget devscripts build-essential debhelper tcl8.6-dev autoconf python3-dev python3-venv python3-setuptools python3-wheel python3-build python3-pip patchelf debhelper libz-dev git libssl-dev tcl-dev chrpath libboost-system-dev libboost-program-options-dev libboost-regex-dev libboost-filesystem-dev" RUN apt update && \ apt install -y $TEMP_INSTALL @@ -28,8 +28,8 @@ WORKDIR /tmp RUN git clone http://github.com/flightaware/tcltls-rebuild.git && \ cd tcltls-rebuild && \ - ./prepare-build.sh buster && \ - cd package-buster && \ + ./prepare-build.sh bullseye && \ + cd package-bullseye && \ dpkg-buildpackage -b --no-sign && \ cd .. && \ dpkg -i tcl-tls_*.deb && \ @@ -40,8 +40,8 @@ WORKDIR /tmp RUN git clone http://github.com/flightaware/piaware_builder && \ cd piaware_builder && \ git checkout tags/${PIAWARE_VERSION} && \ - ./sensible-build.sh buster && \ - cd package-buster && \ + ./sensible-build.sh bookworm && \ + cd package-bookworm && \ dpkg-buildpackage -b --no-sign FROM base AS release