Major overhaul / repo+container rename, etc

.github/workflows/deploy.yml

@@ -30,6 +30,7 @@ env:
 #  DOCKERHUB_REPO: sdr-enthusiasts
 #  DOCKERHUB_IMAGE: shipxplorer
   GHCR_IMAGE: sdr-enthusiasts/shipxplorer
+  GHCR_IMAGE2: sdr-enthusiasts/docker-shipfeeder
   GHCR_REGISTRY: ghcr.io
 
 jobs:
@@ -97,8 +98,8 @@ jobs:
         with:
           driver-opts: image=moby/buildkit:v0.10.6
 
-      # Build "latest"
-      - name: Build & Push - latest
+      # Build "latest" for org and new package
+      - name: Build & Push - latest - org package
         uses: docker/build-push-action@v3
         with:
           context: .
@@ -108,3 +109,14 @@ jobs:
           push: true
           tags: ghcr.io/${{ env.GHCR_IMAGE }}:latest
           labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Build & Push - latest - new package
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./Dockerfile
+          no-cache: true
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          push: true
+          tags: ghcr.io/${{ env.GHCR_IMAGE2 }}:latest
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/markdownlint.yml

@@ -20,4 +20,4 @@ jobs:
       - name: Pull markdownlint/markdownlint:latest Image
         run: docker pull markdownlint/markdownlint:latest
       - name: Run markdownlint against *.md files
-        run: docker run --rm -i -v "$(pwd)":/workdir --workdir /workdir markdownlint/markdownlint:latest --rules ~MD013,~MD033,~MD026,~MD002,~MD022 $(find . -type f -iname '*.md' | grep -v '/.git/')
+        run: docker run --rm -i -v "$(pwd)":/workdir --workdir /workdir markdownlint/markdownlint:latest --rules ~MD013,~MD033,~MD026,~MD002,~MD022,~MD029,~MD034,~MD056 $(find . -type f -iname '*.md' | grep -v '/.git/')

.github/workflows/on_pr.yml

@@ -53,7 +53,6 @@ jobs:
           - linux/amd64
           - linux/arm64
           - linux/arm/v7
-          - linux/i386
 
     steps:
 

.markdownlint.yaml

@@ -0,0 +1,7 @@
+{
+    "MD013": false,
+    "MD033": false,
+    "MD029": false,
+    "MD034": false,
+    "MD056": false
+}

Dockerfile.build-aiscatcher

@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim AS build
+FROM debian:bookwork-slim AS build
 
 RUN set -x && \
     apt-get update -y && \
     apt-get upgrade -y && \
-    apt-get install -q -o Dpkg::Options::="--force-confnew" -y \
+    apt-get install -q -o Dpkg::Options::="--force-confnew" --no-install-recommends -y \
         git make gcc g++ cmake pkg-config librtlsdr-dev libairspy-dev libhackrf-dev libairspyhf-dev libzmq3-dev libsoxr-dev libcurl4-openssl-dev zlib1g-dev && \
     git clone --depth=1 -b develop --single-branch https://github.com/jvde-github/AIS-catcher.git /root/AIS-catcher && \
     cd /root/AIS-catcher && \

buildnow.sh

@@ -1,17 +1,17 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # shellcheck disable=SC2086
 
+echo "Shell: $(bash --version)"
 
 [[ "$1" != "" ]] && BRANCH="$1" || BRANCH="$(git branch --show-current)"
 [[ "$BRANCH" == "main" ]] && TAG="latest" || TAG="$BRANCH"
 [[ "$ARCHS" == "" ]] && ARCHS="linux/armhf,linux/arm64,linux/amd64"
 
 BASETARGET1=ghcr.io/sdr-enthusiasts
-BASETARGET2=kx1t
-
-IMAGE1="$BASETARGET1/$(pwd | sed -n 's|.*/docker-\(.*\)|\1|p'):$TAG"
-IMAGE2="$BASETARGET2/$(pwd | sed -n 's|.*/docker-\(.*\)|\1|p'):$TAG"
+BASETARGET2=ghcr.io/sdr-enthusiasts
 
+IMAGE1="$BASETARGET1/shipxplorer:$TAG"
+IMAGE2="$BASETARGET2/docker-shipfeeder:$TAG"
 
 echo "press enter to start building $IMAGE1 and $IMAGE2 from $BRANCH"
 
@@ -31,7 +31,6 @@ else
     sed -i 's/##BRANCH##/'"$BRANCH"'/g' Dockerfile
 fi
 
-docker buildx build -f Dockerfile --compress --push $2 --platform $ARCHS --tag "$IMAGE1" .
-# [[ $? ]] && docker buildx build --compress --push $2 --platform $ARCHS --tag $IMAGE2 .
+docker buildx build -f Dockerfile --compress --push $2 --platform $ARCHS --tag $IMAGE1 ${IMAGE2:+--tag $IMAGE2} .
 mv -f /tmp/Dockerfile .
 echo "Total build time: $(( $(date +%s) - starttime )) seconds"

config-examples/.env.sample

@@ -1,16 +1,29 @@
-FEEDER_LAT=xx.xxxxx
-FEEDER_LONG=-yy.yyyyy
-SX_SHARING_KEY=fxxxxxxxxxxxxxxxxxxxxxx7
-SX_SERIAL_NUMBER=SXTRPI000000
-SX_RTLSDR_DEVICE_SERIAL=AIS
-SX_RTLSDR_GAIN=auto
-SX_UDP_FEEDS=5.9.207.224:xxxxx,ais.vesselfinder.com:xxxx,144.76.54.111:xxxxx
-SX_EXTRA_OPTIONS=-p -2 -a 192K -H http://aprs.fi/jsonais/post/zxxxxxxV ID MYCALL PROTOCOL aprs INTERVAL 30 RESPONSE off -H http://10.147.20.76:9995/test ID XX-USXXX-AIS INTERVAL 30 RESPONSE off
-SX_STATION_NAME=My Station Name Here
-VA_MASTODON_SERVER=airwaves.social
-VA_MASTODON_ACCESS_TOKEN=9xxxxxxxxxxxxxxxxxxxxxxxxxxxo
-VA_MASTODON_SKIP_FILTER=^[9]{2}[0-9]{7}$$|^[0-9]{7}$$
-VA_MASTODON_CUSTOM_FIELD=Join us! https://vesselalert.com
-VA_DISCORD_NAME=My AIS - My Location, USA
-VA_DISCORD_AVATAR_URL=https://files.airwaves.social/accounts/avatars/xxxxxxxx.jpeg
-VA_DISCORD_WEBHOOKS=
+# ShipFeeder receiver and webpage related parameters:
+FEEDER_LAT=xx.xxxxxx
+FEEDER_LONG=yy.yyyyyy
+RTLSDR_DEVICE_SERIAL=DEVICE-SERIAL
+RTLSDR_DEVICE_GAIN=xxx
+RTLSDR_DEVICE_PPM=xxx
+AISCATCHER_DECODER_AFC_WIDE=on
+AISCATCHER_CHANNELS=AB CD
+STATION_NAME=My Station Name
+#
+# keys and params for aggregators:
+# If you aren't feeding a specific aggregator, leave the value EMPTY or remove the parameter
+AIRFRAMES_STATION_ID=XX-XXXXXXX-AIS
+AISCATCHER_FEEDER_KEY=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+AISHUB_UDP_PORT=xxxx
+APRSFI_FEEDER_KEY=xxxxxxx
+APRSFI_STATION_ID=MYCALL
+BOATBEACON_SHAREDATA=true
+HPRADAR_UDP_PORT=xxxx
+MARINETRAFFIC_UDP_PORT=xxxxx
+MYSHIPTRACKING_UDP_PORT=xxxxx
+RADARVIRTUEL_FEEDER_KEY=xxxxxxxxx
+RADARVIRTUEL_STATION_ID=xx
+SHIPFINDER_SHAREDATA=true
+SHIPPINGEXPLORER_UDP_PORT=xxxxx
+SHIPXPLORER_SHARING_KEY=xxxxxxxxxxxxxxxxxxx
+SHIPXPLORER_SERIAL_NUMBER=SXTRPI00xxxx
+VESSELFINDER_UDP_PORT=xxxx
+VESSELTRACKER_UDP_PORT=xxxx