From 7db5ae92d5e0e111eda2d5e3c721896e6e1c6d65 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Tue, 17 May 2022 22:15:39 +0200
Subject: dump1090: upgrade to 7.2

---
 docker-compose.yml  |  2 +-
 dump1090/Dockerfile | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 51586a6..fea70f2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     logging:
       driver: journald
     ports:
-      - 8080:80
+      - 8080:8080
     restart: always
     volumes:
       - './dump1090/config.js:/usr/share/dump1090-fa/html/config.js:ro'
diff --git a/dump1090/Dockerfile b/dump1090/Dockerfile
index be2de89..2027861 100644
--- a/dump1090/Dockerfile
+++ b/dump1090/Dockerfile
@@ -1,26 +1,27 @@
-FROM debian:stretch-slim AS builder
+FROM debian:bullseye-slim AS builder
 
 # Variables:
-ARG DUMP1090_VERSION=3.8.1
+ARG DUMP1090_VERSION=7.2
 
 WORKDIR /tmp
 
-# Build the dump1090-fa package:
-ADD ["https://github.com/flightaware/dump1090/archive/v${DUMP1090_VERSION}.tar.gz", "./dump1090-${DUMP1090_VERSION}.tar.gz"]
-
-    # dump1090 build dependencies (from README at https://github.com/flightaware/dump1090/blob/v3.8.1/README.md):
-RUN build_deps='build-essential debhelper librtlsdr-dev pkg-config dh-systemd libncurses5-dev libbladerf-dev' && \
+    # dump1090 build dependencies (from README at https://github.com/flightaware/dump1090/blob/v7.2/README.md):
+RUN build_deps='build-essential fakeroot debhelper librtlsdr-dev pkg-config libncurses5-dev libbladerf-dev libhackrf-dev liblimesuite-dev' && \
     apt-get update && \
     DEBIAN_FRONTEND=noninteractive \
-        apt-get install -y --no-install-recommends $build_deps && \
-    tar xzf "dump1090-$DUMP1090_VERSION.tar.gz" && \
+        apt-get install -y --no-install-recommends $build_deps
+
+ADD ["https://github.com/flightaware/dump1090/archive/v${DUMP1090_VERSION}.tar.gz", "./dump1090-${DUMP1090_VERSION}.tar.gz"]
+
+RUN tar xzf "dump1090-$DUMP1090_VERSION.tar.gz" && \
     cd -- "dump1090-$DUMP1090_VERSION" && \
-    dpkg-buildpackage -b && \
-    cd -- .. && \
+    ./prepare-build.sh bullseye && \
+    cd package-bullseye && \
+    dpkg-buildpackage -b --no-sign && \
     dump1090_arch="$( dpkg --print-architecture )" && \
-    mv -- "dump1090-fa_${DUMP1090_VERSION}_${dump1090_arch}.deb" dump1090-fa.deb
+    cp -- "../dump1090-fa_${DUMP1090_VERSION}_${dump1090_arch}.deb" /tmp/dump1090-fa.deb
 
-FROM debian:stretch-slim
+FROM debian:bullseye-slim
 
 LABEL maintainer="Egor Tensin <Egor.Tensin@gmail.com>"
 
-- 
cgit v1.2.3