chore: remove armel arch and radarbox

Thom-x · Feb 25, 2025 · 7103b58 · 7103b58
1 parent 417e1cb
commit 7103b58
Show file tree

Hide file tree

Showing 28 changed files with 42 additions and 403 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: false
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

diff --git a/.github/workflows/pull-request-publish.yml b/.github/workflows/pull-request-publish.yml
@@ -68,7 +68,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: false
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -121,7 +121,7 @@ jobs:
         with:
           context: .
           file: ./Dockerfile
-          platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: true
           tags: ${{ steps.tags.outputs.tags }}
           cache-from: type=local,src=/tmp/.buildx-cache

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -9,7 +9,7 @@ jobs:
   test:
     strategy:
       matrix:
-        architecture: ["linux/amd64", "linux/arm/v6", "linux/arm/v7", "linux/arm64"]
+        architecture: ["linux/amd64", "linux/arm/v7", "linux/arm64"]
     runs-on: ubuntu-latest
 
     steps:

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
-FROM debian:bullseye as dump1090
+FROM debian:bullseye AS dump1090
 
-ENV DUMP1090_VERSION v9.0
+ENV DUMP1090_VERSION=v9.0
 
 # DUMP1090
 RUN apt-get update && \
@@ -23,10 +23,10 @@ RUN git clone -b ${DUMP1090_VERSION} --depth 1 https://github.com/flightaware/du
     patch --ignore-whitespace -p1 -ru --force --no-backup-if-mismatch -d $PWD < /patch/flightradar24.patch && \
     make CPUFEATURES=no
 
-FROM debian:bullseye as piaware
+FROM debian:bullseye AS piaware
 
-ENV DEBIAN_VERSION bullseye
-ENV PIAWARE_VERSION v9.0.1
+ENV DEBIAN_VERSION=bullseye
+ENV PIAWARE_VERSION=v9.0.1
 
 # PIAWARE
 WORKDIR /tmp
@@ -81,7 +81,7 @@ RUN ./sensible-build.sh ${DEBIAN_VERSION} && \
 #ADSBEXCHANGE
 # pinned commits, feel free to update to most recent commit, no major versions usually
 
-FROM debian:bullseye as adsbexchange_packages
+FROM debian:bullseye AS adsbexchange_packages
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 WORKDIR /tmp
@@ -102,7 +102,7 @@ RUN set -x && \
     python3-venv \
     python3-dev
 
-FROM adsbexchange_packages as adsbexchange
+FROM adsbexchange_packages AS adsbexchange
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 WORKDIR /tmp
 RUN set -x && \
@@ -144,77 +144,6 @@ RUN set -x && \
     # mlat-client: simple test
     /usr/local/share/adsbexchange/venv/bin/python3 -c 'import mlat.client'
 
-FROM debian:bullseye as radarbox
-
-# git -c 'versionsort.suffix=-' ls-remote --tags --sort='v:refname' 'https://github.com/mutability/mlat-client.git' | cut -d '/' -f 3 | grep '^v.*' | tail -1
-ENV RADARBOX_MLAT_VERSION v0.2.13
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-WORKDIR /tmp
-RUN set -x && \
-    dpkg --add-architecture armhf && \
-    apt-get update && \
-    apt-get install -y --no-install-suggests --no-install-recommends \
-        ca-certificates \
-        binutils \
-        wget \
-        gnupg \
-        build-essential \
-        git \
-        python3-minimal \
-        python3-distutils \
-        python3-venv \
-        libpython3-dev \
-        libc6:armhf \
-        libcurl4:armhf \
-        libglib2.0-0:armhf \
-        libjansson4:armhf \
-        libprotobuf-c1:armhf \
-        librtlsdr0:armhf \
-        netbase \
-        xz-utils  && \
-    rm -rf /var/lib/apt/lists/* && \
-    dpkg --add-architecture armhf && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 1D043681 && \
-    bash -c "echo 'deb https://apt.rb24.com/ bullseye main' > /etc/apt/sources.list.d/rb24.list" && \
-    apt-get update && \
-    # download rbfeeder deb
-    cd /tmp && \
-    apt-get download rbfeeder:armhf && \
-    # extract rbfeeder deb
-    ar xv ./rbfeeder_*armhf.deb && \
-    tar xvf ./data.tar.xz -C / && \
-    # mlat-client
-    SRCTMP=/srctmp && \
-    URL=https://github.com/mutability/mlat-client && \
-    mkdir -p $SRCTMP && wget -O ${SRCTMP}.tar.gz ${URL}/archive/refs/tags/${RADARBOX_MLAT_VERSION}.tar.gz && tar xf ${SRCTMP}.tar.gz -C ${SRCTMP} --strip-components=1 && \
-    pushd ${SRCTMP} && \
-    VENV="/usr/local/share/radarbox-mlat-client/venv" && \
-    python3 -m venv "${VENV}" && \
-    source "${VENV}/bin/activate" && \
-    ./setup.py build && \
-    ./setup.py install && \
-    deactivate && \
-    popd && \
-    rm -rf ${SRCTMP} ${SRCTMP}.tar.gz && \
-    # mlat-client: simple test
-    /usr/local/share/radarbox-mlat-client/venv/bin/python3 -c 'import mlat.client'
-
-FROM debian:bullseye as rbfeeder_fixcputemp
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-ADD rbfeeder_fixcputemp ./
-RUN set -x && \
-    apt-get update && \
-    apt-get install -y --no-install-suggests --no-install-recommends \
-        build-essential
-ARG TARGETARCH
-RUN if [ $TARGETARCH != "arm" ]; then \
-        apt-get install -y crossbuild-essential-armhf && \
-        make CC=arm-linux-gnueabihf-gcc \
-    ; else \
-        make \
-    ; fi
-
 # THTTPD
 FROM alpine:3.19.1 AS thttpd
 
@@ -234,7 +163,7 @@ RUN cd /thttpd \
     && make CCOPT='-O2 -s -static' thttpd
 
 # CONFD
-FROM debian:bullseye-slim as confd
+FROM debian:bullseye-slim AS confd
 
 ADD confd/confd.tar.gz /opt/confd/
 RUN ARCH=$(dpkg --print-architecture) && \
@@ -243,7 +172,7 @@ RUN ARCH=$(dpkg --print-architecture) && \
     rm /opt/confd/bin/confd-*
 
 # ONE STAGE COPY ALL
-FROM debian:bullseye-slim as copyall
+FROM debian:bullseye-slim AS copyall
 
 COPY --from=dump1090 /tmp/dump1090/dump1090 /copy_root/usr/lib/fr24/
 COPY --from=dump1090 /tmp/dump1090/public_html /copy_root/usr/lib/fr24/public_html
@@ -256,42 +185,36 @@ RUN mv /copy_root/tcltls-rebuild/tcl-tls_*.deb /copy_root/tcl-tls.deb && \
     rm -rf /copy_root/tcltls-rebuild
 COPY --from=thttpd /thttpd/thttpd /copy_root/
 COPY --from=confd /opt/confd/bin/confd /copy_root/opt/confd/bin/
-COPY --from=radarbox /usr/bin/rbfeeder /copy_root/usr/bin/rbfeeder_armhf
-COPY --from=radarbox /usr/bin/dump1090-rb /copy_root/usr/bin/dump1090-rbs
-COPY --from=radarbox /usr/local/share/radarbox-mlat-client /copy_root/usr/local/share/radarbox-mlat-client
-COPY --from=rbfeeder_fixcputemp ./librbfeeder_fixcputemp.so /copy_root/usr/lib/arm-linux-gnueabihf/librbfeeder_fixcputemp.so
 ADD build /copy_root/build
 
-FROM debian:bullseye-slim as serve
+FROM debian:bullseye-slim AS serve
 
-ENV DEBIAN_VERSION bullseye
-ENV RTL_SDR_VERSION 0.6.0
+ENV DEBIAN_VERSION=bullseye
+ENV RTL_SDR_VERSION=0.6.0
 
-ENV FR24FEED_AMD64_VERSION 1.0.44-0
-ENV FR24FEED_ARMHF_VERSION 1.0.44-0
-ENV FR24FEED_ARMEL_VERSION 1.0.44-0
+ENV FR24FEED_AMD64_VERSION=1.0.44-0
+ENV FR24FEED_ARMHF_VERSION=1.0.44-0
 
-ENV PLANEFINDER_AMD64_VERSION 5.0.162
-ENV PLANEFINDER_ARMHF_VERSION 5.0.161
+ENV PLANEFINDER_AMD64_VERSION=5.0.162
+ENV PLANEFINDER_ARMHF_VERSION=5.0.161
 
-ENV S6_OVERLAY_VERSION 3.1.3.0
+ENV S6_OVERLAY_VERSION=3.1.3.0
 
 # Services startup
-ENV SERVICE_ENABLE_DUMP1090 true
-ENV SERVICE_ENABLE_PIAWARE true
-ENV SERVICE_ENABLE_FR24FEED true
-ENV SERVICE_ENABLE_HTTP true
-ENV SERVICE_ENABLE_IMPORT_OVER_NETCAT false
-ENV SERVICE_ENABLE_ADSBEXCHANGE false
-ENV SERVICE_ENABLE_PLANEFINDER false
-ENV SERVICE_ENABLE_OPENSKY false
-ENV SERVICE_ENABLE_ADSBFI false
-ENV SERVICE_ENABLE_RADARBOX false
-ENV SERVICE_ENABLE_ADSBHUB false
+ENV SERVICE_ENABLE_DUMP1090=true
+ENV SERVICE_ENABLE_PIAWARE=true
+ENV SERVICE_ENABLE_FR24FEED=true
+ENV SERVICE_ENABLE_HTTP=true
+ENV SERVICE_ENABLE_IMPORT_OVER_NETCAT=false
+ENV SERVICE_ENABLE_ADSBEXCHANGE=false
+ENV SERVICE_ENABLE_PLANEFINDER=false
+ENV SERVICE_ENABLE_OPENSKY=false
+ENV SERVICE_ENABLE_ADSBFI=false
+ENV SERVICE_ENABLE_ADSBHUB=false
 
 # System properties
-ENV SYSTEM_HTTP_ULIMIT_N -1
-ENV SYSTEM_FR24FEED_ULIMIT_N -1
+ENV SYSTEM_HTTP_ULIMIT_N=-1
+ENV SYSTEM_FR24FEED_ULIMIT_N=-1
 
 LABEL maintainer="maugin.thomas@gmail.com"
 
@@ -339,21 +262,7 @@ RUN dpkg --add-architecture armhf && \
     python3-venv \
     curl \
     gzip \
-    # radarbox
-    qemu-user-static \
-    build-essential \
-    python3-minimal \
-    python3-distutils \
-    libcurl4:armhf \
-    libglib2.0-0:armhf \
-    libjansson4:armhf \
-    libprotobuf-c1:armhf \
-    librtlsdr0:armhf \
-    netbase \
     && \
-    # Simple checks qemu
-    qemu-arm-static --version && \
-    qemu-aarch64-static --version && \
     # RTL-SDR
     cd /tmp && \
     mkdir -p /etc/modprobe.d && \
@@ -391,20 +300,19 @@ RUN dpkg --add-architecture armhf && \
     rm /etc/piaware.conf && \
     rm /piaware.deb && \
     /usr/bin/piaware -v && \
-    # # OPENSKY
-    curl --output - https://opensky-network.org/files/firmware/opensky.gpg.pub | apt-key add - && \
-    echo deb https://opensky-network.org/repos/debian opensky custom > /etc/apt/sources.list.d/opensky.list && \
-    apt-get update -y && \
-    # Install opensky-feeder
+    # OPENSKY
     mkdir -p /src/opensky-feeder && \
     cd /src/opensky-feeder && \
-    apt-get download opensky-feeder && \
+    DOWNLOAD_ARCH=$(case ${arch:-amd64} in \
+        "amd64")echo "amd64" ;; \
+        "armhf")echo "armhf" ;; \
+        "arm64")echo "arm64" ;; esac) && \
+    echo "DOWNLOAD_ARCH=$DOWNLOAD_ARCH" && \
+    wget https://opensky-network.org/files/firmware/opensky-feeder_latest_${DOWNLOAD_ARCH}.deb && \
     ar vx ./*.deb && \
     tar xvf data.tar.xz -C / && \
+    rm ./*.deb && \
     mkdir -p /var/lib/openskyd/conf.d && \
-    # Radarbox : create symlink for rbfeeder wrapper
-    mv /build/rbfeeder_wrapper.sh /usr/bin/rbfeeder_wrapper.sh && \
-    ln -s /usr/bin/rbfeeder_wrapper.sh /usr/bin/rbfeeder && \
     # THTTPD
     find /usr/lib/fr24/public_html -type d -print0 | xargs -0 chmod 0755 && \
     find /usr/lib/fr24/public_html -type f -print0 | xargs -0 chmod 0644 && \
@@ -418,9 +326,6 @@ RUN dpkg --add-architecture armhf && \
     # PLANEFINDER
     /build/planefinder.sh && \
     /planefinder/pfclient --version && \
-    # RADARBOX
-    /usr/local/share/radarbox-mlat-client/venv/bin/mlat-client --help && \
-    /usr/bin/rbfeeder --version && \
     # CONFD
     /opt/confd/bin/confd --version && \
     # S6 OVERLAY

diff --git a/README.md b/README.md
@@ -55,8 +55,6 @@ docker run -d -p 8080:8080 -p 8754:8754 \
 	-e 'SERVICE_ENABLE_ADSBFI=true' \
 	-e 'ADSBFI_UUID=MY_UUID' \
 	-e 'ADSBFI_STATION_NAME=MY_STATION_NAME' \
-	-e 'SERVICE_ENABLE_RADARBOX=true' \
-	-e 'RADARBOX_SHARING_KEY=MY_RADARBOX_SHARING_KEY' \
 	-e 'SERVICE_ENABLE_ADSBHUB=true' \
 	-e 'ADSBHUB_CKEY=MY_ADSBHUB_SHARING_KEY' \
 	--tmpfs /run:exec,size=32M \
@@ -89,7 +87,6 @@ To disable starting a service you can add an environement variable :
 | `SERVICE_ENABLE_PLANEFINDER`        | `false` | Disable plane finder feed  | `false`       |
 | `SERVICE_ENABLE_OPENSKY`            | `false` | Disable opensky feeder     | `false`       |
 | `SERVICE_ENABLE_ADSBFI`             | `false` | Disable adsb.fi feeder     | `false`       |
-| `SERVICE_ENABLE_RADARBOX`           | `false` | Disable radarbox feeder    | `false`       |
 | `SERVICE_ENABLE_ADSBHUB`            | `false` | Disable adsbhub feeder     | `false`       |
 
 
@@ -307,56 +304,6 @@ Add the environment variable `SERVICE_ENABLE_OPENSKY` and set it to `true`.
 
 Ex : `-e 'SERVICE_ENABLE_OPENSKY=true' -e 'OPENSKY_USERNAME=MyUserName' -e 'OPENSKY_SERIAL=-462168426854'`
 
-## Radarbox
-
-First-time users should obtain a sharing key.
-
-In order to obtain a sharing key, we will start a temporary container running minimal configuration to have radarbox up and running, which will generate it.
-
-Run :
-
-```
-docker run -it --rm \
-	-e 'SERVICE_ENABLE_RADARBOX=true' \
-	-e 'SERVICE_ENABLE_DUMP1090=false' \
-	-e 'SERVICE_ENABLE_HTTP=false' \
-	-e 'SERVICE_ENABLE_PIAWARE=false' \
-	-e 'SERVICE_ENABLE_FR24FEED=false' \
-	-e 'HTML_SITE_LAT=45' \
-	-e 'HTML_SITE_LON=9' \
-	-e 'HTML_SITE_ALT=0' \
-	thomx/fr24feed-piaware /bin/bash
-```
-
-Once the container has started, you should see a message such as:
-
-```text
-[radarbox-feeder] [2023-06-20 18:51:01]  CPU Serial empty. Use MAC address instead.
-[radarbox-feeder] [2023-06-20 18:51:02]  Your new key is 35345bf2258aea6b9c7280fbe4467fcd. Please save this key for future use. You will have to know this key to link this receiver to your account in RadarBox24.com. This key is also saved in configuration file (/etc/rbfeeder.ini)
-```
-
-Note the serial and add it for next run to `RADARBOX_SHARING_KEY` environement variable.
-
-You can now kill the container by pressing `CTRL-D`.
-
-Add the environment variable `SERVICE_ENABLE_RADARBOX` and set it to `true`.
-
-| Environment Variable    | Default value | Description                                      |
-| ----------------------- | ------------- | ------------------------------------------------ |
-| `RADARBOX_SHARING_KEY`  | empty         | Generated sharing key (required after first run) |
-| `RADARBOX_INPUT_HOST`   | `127.0.0.1`   | Input host                                       |
-| `RADARBOX_INPUT_PORT`   | `30005`       | Input port                                       |
-| `RADARBOX_MLAT     `    | `false`       | Enable/disable MLAT                              |
-| `HTML_SITE_LAT`         | `45.0`        | Receiver latitude                                |
-| `HTML_SITE_LON`         | `9.0`         | Receiver longitude                               |
-| `HTML_SITE_ALT`         | `0`           | Receiver altitude                                |
-
-Ex : `-e 'SERVICE_ENABLE_RADARBOX=true' -e 'RADARBOX_SHARING_KEY=35345bf2258aea6b9c7280fbe4467fcd'`
-
-_Note : You may have this error on windows `[radarbox-feeder] /usr/bin/rbfeeder: line 17:   208 Segmentation fault      /usr/bin/rbfeeder_armhf "$@"`, there is no solution to it._
-_Note : You may have seg fault error, see https://github.com/mikenye/docker-radarbox/issues/9#issuecomment-633068833 for resolution_
-_Note : You may have 'already claimed' error on supplied sharing key, see https://github.com/Thom-x/docker-fr24feed-piaware-dump1090/issues/145_
-
 ## Adsbhub
 
 First-time users should obtain a sharing key.
@@ -405,7 +352,6 @@ Example :
 | `HTML_RECEIVER_STATS_PAGE_ADSBEXCHANGE`    | empty           | URL of your receiver's stats page on ADS-B Exchange. Usually https://www.adsbexchange.com/api/feeders/?feed=<ID>                                            |
 | `HTML_RECEIVER_STATS_PAGE_PLANEFINDER`     | empty           | URL of your receiver's stats page on PlaneFinder. Usually https://planefinder.net/coverage/receiver/<ID>                                                    |
 | `HTML_RECEIVER_STATS_PAGE_OPENSKY_NETWORK` | empty           | URL of your receiver's stats page on Opensky Netowrk. Usually https://opensky-network.org/receiver-profile?s=<ID>                                           |
-| `HTML_RECEIVER_STATS_PAGE_RADARBOX`        | empty           | URL of your receiver's stats page on Radarbox. Usually https://www.radarbox.com/stations/<ID>                                                               |
 | `HTML_RECEIVER_STATS_PAGE_ADSBFI`          | empty           | URL of your receiver's stats page on ADSB.fi. Usually https://adsb.fi/                                                                                      |
 | `HTML_RECEIVER_STATS_PAGE_ADSBHUB`         | empty           | URL of your receiver's stats page on ADSBHub. Usually https://www.adsbhub.org/statistic.php                                                                 |
 | `HTML_FR24_FEEDER_STATUS_PAGE`             | empty           | URL of your local FR24 Feeder Status page. Usually http://<dockerhost>:8754/ (depends on the port you indicated when starting the container)                |

diff --git a/build/fr24feed.sh b/build/fr24feed.sh
@@ -9,10 +9,6 @@ case $arch in
     url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_${FR24FEED_ARMHF_VERSION}_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
     dirname=fr24feed_armhf
     ;;
-  armel)
-    url=https://repo-feed.flightradar24.com/rpi_binaries/fr24feed_${FR24FEED_ARMEL_VERSION}_armhf.tgz # force version 1.0.25-3 because of broken version for rpi
-    dirname=fr24feed_armhf
-    ;;
   amd64)
     url=https://repo-feed.flightradar24.com/linux_binaries/fr24feed_${FR24FEED_AMD64_VERSION}_amd64.tgz
     dirname=fr24feed_amd64

diff --git a/build/planefinder.sh b/build/planefinder.sh
@@ -7,9 +7,6 @@ case $arch in
   arm64)
     url=http://client.planefinder.net/pfclient_${PLANEFINDER_ARMHF_VERSION}_armhf.tar.gz
     ;;
-  armel)
-    url=http://client.planefinder.net/pfclient_${PLANEFINDER_ARMHF_VERSION}_armhf.tar.gz
-    ;;
   amd64)
     url=http://client.planefinder.net/pfclient_${PLANEFINDER_AMD64_VERSION}_amd64.tar.gz
     ;;
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,9 +7,6 @@ case $arch in @@
       arm64)
         url=http://client.planefinder.net/pfclient_${PLANEFINDER_ARMHF_VERSION}_armhf.tar.gz
         ;;
-      armel)
-        url=http://client.planefinder.net/pfclient_${PLANEFINDER_ARMHF_VERSION}_armhf.tar.gz
-        ;;
       amd64)
         url=http://client.planefinder.net/pfclient_${PLANEFINDER_AMD64_VERSION}_amd64.tar.gz
         ;;
@@ Expand Down @@