Pending latest changes from Widehopf: Dev

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: weekly
+    open-pull-requests-limit: 5

.github/workflows/build.yaml

@@ -0,0 +1,56 @@
+name: Build and test
+
+on:
+  push:
+    branches: [dev, sid]
+  pull_request:
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    name: ${{ matrix.os }} / ${{ matrix.cc }} / RTLSDR=${{ matrix.rtlsdr }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-22.04
+            cc: gcc
+            rtlsdr: "no"
+          - os: ubuntu-22.04
+            cc: clang
+            rtlsdr: "no"
+          - os: ubuntu-24.04
+            cc: gcc
+            rtlsdr: "no"
+          - os: ubuntu-24.04
+            cc: clang
+            rtlsdr: "no"
+          - os: ubuntu-24.04
+            cc: gcc
+            rtlsdr: "yes"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v7
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            pkg-config libncurses-dev zlib1g-dev libzstd-dev
+          if [ "${{ matrix.rtlsdr }}" = "yes" ]; then
+            sudo apt-get install -y --no-install-recommends librtlsdr-dev libusb-1.0-0-dev
+          fi
+
+      - name: Build
+        run: make -j"$(nproc)" CC=${{ matrix.cc }} RTLSDR=${{ matrix.rtlsdr }}
+
+      - name: Test
+        run: make test CC=${{ matrix.cc }}

.github/workflows/docker.yaml

@@ -2,15 +2,16 @@ name: docker build
 
 on:
   schedule:
-  - cron: "0 10 * * *"
+    - cron: "0 5 * * 1"
   push:
     branches:
-    - "**"
+      - "dev"
+      - "sid"
     tags:
-    - "v*.*.*"
+      - "v*.*.*"
   pull_request:
     branches:
-    - "dev"
+      - "dev"
 
 jobs:
   docker:
@@ -21,13 +22,13 @@ jobs:
     - name: Set variables useful for later
       id: useful_vars
       run: |-
-        echo "::set-output name=timestamp::$(date +%s)"
-        echo "::set-output name=short_sha::${GITHUB_SHA::8}"
+        echo "name=timestamp::$(date +%s)" >> $GITHUB_OUTPUT
+        echo "name=short_sha::${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v7
     - name: Docker meta
       id: docker_meta
-      uses: docker/metadata-action@v4
+      uses: docker/metadata-action@v6
       with:
         images: ghcr.io/${{ github.repository }}
         tags: |
@@ -42,30 +43,24 @@ jobs:
           type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
           type=raw,value=${{ github.ref_name }}-${{ steps.useful_vars.outputs.short_sha }}-${{ steps.useful_vars.outputs.timestamp }},enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
+      uses: docker/setup-qemu-action@v4
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v4
     - name: Login to GHCR
       if: github.event_name != 'pull_request'
-      uses: docker/login-action@v2
+      uses: docker/login-action@v4
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Cache Docker layers
-      uses: actions/cache@v3
-      with:
-        path: /tmp/.buildx-cache
-        key: ${{ runner.os }}-buildx-${{ github.sha }}
-        restore-keys: |
-          ${{ runner.os }}-buildx-
     - name: Build and push
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v7
       with:
         context: .
         push: ${{ github.event_name != 'pull_request' }}
         tags: ${{ steps.docker_meta.outputs.tags }}
         labels: ${{ steps.docker_meta.outputs.labels }}
         platforms: linux/amd64,linux/arm64
-        cache-from: type=local,src=/tmp/.buildx-cache
-        cache-to: type=local,dest=/tmp/.buildx-cache,mode=max
+        build-args: |
+          BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
+        outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true

.gitignore

@@ -9,3 +9,5 @@ oneoff/decode_comm_b
 readsb
 viewadsb
 .version
+cprtests
+crctests

Dockerfile

@@ -1,52 +1,47 @@
-FROM debian:bookworm-20240311 AS builder
-RUN apt-get update && \
-    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
+FROM ghcr.io/wiedehopf/readsb-builder:latest AS builder
 
-# install jemalloc
-RUN JEMALLOC_BDIR=$(mktemp -d) && \
-    git clone --depth 1 https://github.com/jemalloc/jemalloc $JEMALLOC_BDIR && \
-    cd $JEMALLOC_BDIR && \
-    ./autogen.sh && \
-    ./configure --with-lg-page=14 && \
-    make -j$(nproc) && \
-    make install && \
-    rm -rf $JEMALLOC_BDIR
-
-# install readsb
-RUN mkdir -p /app/git
-COPY . /app/git
-RUN cd /app/git && \
+SHELL ["/bin/bash", "-x", "-o", "pipefail", "-c"]
+RUN --mount=type=bind,source=.,target=/app/git \
+    cd /app/git && \
     READSB_BUILD_DIR=$(mktemp -d) && \
-    cp -r /app/git/* $READSB_BUILD_DIR && \
+    cp -aT /app/git $READSB_BUILD_DIR && \
     cd $READSB_BUILD_DIR && \
-    make -j$(nproc) RTLSDR=yes OPTIMIZE="-O2" && \
+    [[ $(uname -m) == x86_64 ]] && MARCH=" -march=nehalem" || MARCH="" && \
+    make -j$(nproc) RTLSDR=yes OPTIMIZE="-O2 $MARCH" &&\
     mv readsb /usr/local/bin && \
     mv viewadsb /usr/local/bin && \
     chmod +x /usr/local/bin/viewadsb /usr/local/bin/readsb && \
     make clean && \
-    make -j$(nproc) PRINT_UUIDS=yes TRACKS_UUID=yes OPTIMIZE="-O2" && \
+    make -j$(nproc) WITH_UUIDS=yes OPTIMIZE="-O2 $MARCH" && \
+    mv readsb /usr/local/bin/readsb-with-uuids && \
+    make clean && \
+    make -j$(nproc) PRINT_UUIDS=yes TRACKS_UUID=yes OPTIMIZE="-O2 $MARCH" && \
     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 && \
     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 --timeout 10 --tries=6 --retry-connrefused --retry-on-http-error=404,429,500,502,503,504 -O /usr/local/share/tar1090/aircraft.csv.gz https://raw.githubusercontent.com/wiedehopf/tar1090-db/csv/aircraft.csv.gz && \
     true
 
-FROM debian:bookworm-slim
-RUN apt-get update && \
+FROM debian:trixie-slim
+RUN \
+    --mount=type=bind,from=builder,source=/,target=/builder/ \
+    apt-get update && \
     apt-get -y install --no-install-recommends \
-    wget \
     librtlsdr0 libncurses6 zlib1g libzstd1 && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-    mkdir -p /run/readsb
+    mkdir -p /run/readsb && \
+    cp /builder/usr/local/bin/readsb* /usr/local/bin/ && \
+    cp /builder/usr/local/bin/viewadsb* /usr/local/bin/ && \
+    mkdir -p  /usr/local/share/tar1090 && \
+    cp /builder/usr/local/share/tar1090/aircraft.csv.gz /usr/local/share/tar1090/aircraft.csv.gz && \
+    cp /builder/usr/local/lib/libjemalloc.so.2 /usr/local/lib/libjemalloc.so.2 && \
+    true
 
 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
+ENV MALLOC_CONF=narenas:1,tcache:false
 
 ENTRYPOINT ["/usr/local/bin/readsb"]