From 78865249d6dc138ec49e295dd2627ef1e024bd49 Mon Sep 17 00:00:00 2001
From: Matthias Wirth <matthias.wirth@gmail.com>
Date: Wed, 27 Mar 2024 12:32:19 +0100
Subject: [PATCH] simplify Dockerfile

---
 Dockerfile | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e65f7b16..896f536a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,50 +1,52 @@
-FROM debian:bookworm AS builder
-RUN mkdir -p /app/git
-COPY required_packages /app/git
+FROM debian:bookworm-20240311 AS builder
 RUN apt-get update && \
-    apt-get install -y git wget gdb pkg-config autoconf $(cat /app/git/required_packages)
+    apt-get install -y git wget pkg-config autoconf gcc make libusb-1.0-0-dev librtlsdr-dev librtlsdr0 libncurses-dev zlib1g-dev zlib1g libzstd-dev libzstd1
 
 # install jemalloc
-RUN JEMALLOC=$(mktemp -d) && \
-    git clone https://github.com/jemalloc/jemalloc $JEMALLOC && \
-    cd $JEMALLOC && \
+RUN JEMALLOC_BDIR=$(mktemp -d) && \
+    git clone --depth 1 https://github.com/jemalloc/jemalloc $JEMALLOC_BDIR && \
+    cd $JEMALLOC_BDIR && \
     ./autogen.sh && \
     ./configure && \
     make -j$(nproc) && \
-    make install
+    make install && \
+    rm -rf $JEMALLOC_BDIR
+
 # install readsb
+RUN mkdir -p /app/git
 COPY . /app/git
 RUN cd /app/git && \
     READSB_BUILD_DIR=$(mktemp -d) && \
     cp -r /app/git/* $READSB_BUILD_DIR && \
     cd $READSB_BUILD_DIR && \
-    make -j$(nproc) OPTIMIZE="-O2" && \
+    make -j$(nproc) RTLSDR=yes OPTIMIZE="-O2" && \
     mv readsb /usr/local/bin && \
     mv viewadsb /usr/local/bin && \
     chmod +x /usr/local/bin/viewadsb /usr/local/bin/readsb && \
-    READSB_UUID_BUILD_DIR=$(mktemp -d) && \
-    cp -r /app/git/* $READSB_UUID_BUILD_DIR && \
-    cd $READSB_UUID_BUILD_DIR && \
+    make clean && \
     make -j$(nproc) PRINT_UUIDS=yes OPTIMIZE="-O2" && \
     mv readsb /usr/local/bin/readsb-uuid && \
     mv viewadsb /usr/local/bin/viewadsb-uuid && \
     chmod +x /usr/local/bin/viewadsb-uuid && \
     chmod +x /usr/local/bin/readsb-uuid && \
-    rm -rf $READSB_BUILD_DIR $READSB_UUID_BUILD_DIR && \
+    rm -rf $READSB_BUILD_DIR && \
     mkdir -p  /usr/local/share/tar1090 && \
-    wget -O /usr/local/share/tar1090/aircraft.csv.gz https://github.com/wiedehopf/tar1090-db/raw/csv/aircraft.csv.gz
+    wget -O /usr/local/share/tar1090/aircraft.csv.gz https://github.com/wiedehopf/tar1090-db/raw/csv/aircraft.csv.gz && \
+    true
 
 FROM debian:bookworm-slim
 RUN apt-get update && \
     apt-get -y install --no-install-recommends \
-    rsync openssh-client openssh-server wget \
-    libusb-1.0-0-dev librtlsdr-dev librtlsdr0 libncurses-dev zlib1g-dev zlib1g libzstd-dev libzstd1 && \
+    wget \
+    librtlsdr0 libncurses6 zlib1g libzstd1 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
     mkdir -p /run/readsb
+
 ENV LD_PRELOAD=/usr/local/lib/libjemalloc.so.2
 COPY --from=builder /usr/local/bin/readsb* /usr/local/bin/
 COPY --from=builder /usr/local/bin/viewadsb* /usr/local/bin/
 COPY --from=builder /usr/local/share/tar1090/aircraft.csv.gz /usr/local/share/tar1090/aircraft.csv.gz
 COPY --from=builder /usr/local/lib/libjemalloc.so.2 /usr/local/lib/libjemalloc.so.2
+
 ENTRYPOINT ["/usr/local/bin/readsb"]