From 7aeccb8bfc0a5f5a7485f70a5a397167ac8f82af Mon Sep 17 00:00:00 2001 From: kx1t <15090643+kx1t@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:45:13 +0000 Subject: [PATCH] changes related to radarbox -> airnavradar branding update (#345) * Bump debian from bookworm-20241111-slim to bookworm-20241223-slim Bumps debian from bookworm-20241111-slim to bookworm-20241223-slim. --- updated-dependencies: - dependency-name: debian dependency-type: direct:production ... Signed-off-by: dependabot[bot] * changes related to radarbox -> airnavradar branding update --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Fred Clausen <43556888+fredclausen@users.noreply.github.com> --- .github/workflows/deploy_ghcr.yml | 6 +++--- .github/workflows/on_pr.yml | 6 +++--- DEPLOY_STATUS.MD | 4 ++-- Dockerfile.base | 2 +- Dockerfile.mlatclient | 2 +- README.md | 6 +++--- SDR-Containers.MD | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/deploy_ghcr.yml b/.github/workflows/deploy_ghcr.yml index f593f5dc..72118975 100644 --- a/.github/workflows/deploy_ghcr.yml +++ b/.github/workflows/deploy_ghcr.yml @@ -695,14 +695,14 @@ jobs: echo "$WORKFLOW_AUTH_TOKEN" | gh auth login --with-token gh workflow run --ref main --repo "$WORKFLOW_REPO" "$WORKFLOW_FILE" -f reason="$WORKFLOW_REASON" - trigger_build_sdr-enthusiasts_docker-radarbox: - name: Trigger deploy of sdr-enthusiasts/docker-radarbox + trigger_build_sdr-enthusiasts_docker-airnavradar: + name: Trigger deploy of sdr-enthusiasts/docker-airnavradar needs: [deploy_qemu, deploy_ghcr_mlat_client] runs-on: ubuntu-latest if: ${{ github.event.inputs.disable_upstream_triggers != 'true' }} env: WORKFLOW_AUTH_TOKEN: ${{ secrets.GH_PAT_MIKENYE }} - WORKFLOW_REPO: sdr-enthusiasts/docker-radarbox + WORKFLOW_REPO: sdr-enthusiasts/docker-airnavradar WORKFLOW_FILE: deploy.yml WORKFLOW_REASON: "triggered via deploy_ghcr.yml in sdr-enthusiasts/docker-baseimage" steps: diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index ea1a5d7e..3e74b157 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -1011,13 +1011,13 @@ jobs: echo "$WORKFLOW_AUTH_TOKEN" | gh auth login --with-token gh workflow run --ref main --repo "$WORKFLOW_REPO" "$WORKFLOW_FILE" -f reason="$WORKFLOW_REASON" -f use_test_image=true - trigger_build_sdr-enthusiasts_docker-radarbox: - name: Trigger deploy of sdr-enthusiasts/docker-radarbox + trigger_build_sdr-enthusiasts_docker-airnavradar: + name: Trigger deploy of sdr-enthusiasts/docker-airnavradar needs: [deploy_qemu, deploy_ghcr_mlat_client] runs-on: ubuntu-latest env: WORKFLOW_AUTH_TOKEN: ${{ secrets.GH_PAT_MIKENYE }} - WORKFLOW_REPO: sdr-enthusiasts/docker-radarbox + WORKFLOW_REPO: sdr-enthusiasts/docker-airnavradar WORKFLOW_FILE: deploy.yml WORKFLOW_REASON: "triggered via deploy_ghcr.yml in sdr-enthusiasts/docker-baseimage" WORKFLOW_USE_TEST_IMAGE: true diff --git a/DEPLOY_STATUS.MD b/DEPLOY_STATUS.MD index 6cf4bf85..9c118af0 100644 --- a/DEPLOY_STATUS.MD +++ b/DEPLOY_STATUS.MD @@ -8,7 +8,7 @@ |-----------|-----------| | acarsdec | [![acarsdec](https://github.com/sdr-enthusiasts/docker-acarsdec/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-acarsdec/actions/workflows/deploy.yml) | | ACARS Hub | [![ACARS Hub](https://github.com/sdr-enthusiasts/docker-acarshub/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-acarshub/actions/workflows/deploy.yml) | -| acars_oxide | [![ACARS Oxide](https://github.com/sdr-enthusiasts/acars-oxide/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/acars-oxide/actions/workflows/deploy.yml) +| acars_oxide | [![ACARS Oxide](https://github.com/sdr-enthusiasts/acars-oxide/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/acars-oxide/actions/workflows/deploy.yml) | | acars_router | [![acars_router](https://github.com/sdr-enthusiasts/acars_router/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/acars_router/actions/workflows/deploy.yml) | | dumpvdl2 | [![Deploy](https://github.com/sdr-enthusiasts/docker-dumpvdl2/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-dumpvdl2/actions/workflows/deploy.yml) | | vdlm2dec | [![vdlm2dec](https://github.com/sdr-enthusiasts/docker-vdlm2dec/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-vdlm2dec/actions/workflows/deploy.yml) | @@ -24,7 +24,7 @@ | OpenSky | [![OpenSky](https://github.com/sdr-enthusiasts/docker-opensky-network/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-opensky-network/actions/workflows/deploy.yml) | | Piaware | [![PiAware](https://github.com/sdr-enthusiasts/docker-piaware/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-piaware/actions/workflows/deploy.yml) | | PlaneFinder | [![PlaneFinder](https://github.com/sdr-enthusiasts/docker-planefinder/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-planefinder/actions/workflows/deploy.yml) | -| Radarbox | [![RadarBox](https://github.com/sdr-enthusiasts/docker-radarbox/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-radarbox/actions/workflows/deploy.yml) | +| AirNav Radar | [![Airnav Radar](https://github.com/sdr-enthusiasts/docker-airnavradar/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-airnavradar/actions/workflows/deploy.yml) | | Radar Virtuel | [![RadarVirtuel](https://github.com/sdr-enthusiasts/docker-radarvirtuel/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-radarvirtuel/actions/workflows/deploy.yml) | | readsb-protobuf | [![readsb-protobuf](https://github.com/sdr-enthusiasts/docker-readsb-protobuf/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-readsb-protobuf/actions/workflows/deploy.yml) | | tar1090 | [![tar1090](https://github.com/sdr-enthusiasts/docker-tar1090/actions/workflows/deploy.yml/badge.svg)](https://github.com/sdr-enthusiasts/docker-tar1090/actions/workflows/deploy.yml) | diff --git a/Dockerfile.base b/Dockerfile.base index 68c1d07b..de1129e2 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM debian:bookworm-20241111-slim +FROM debian:bookworm-20241223-slim ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ S6OVERLAY_VERSION="v3.2.0.2" \ diff --git a/Dockerfile.mlatclient b/Dockerfile.mlatclient index ec9074e6..8ab4a42d 100644 --- a/Dockerfile.mlatclient +++ b/Dockerfile.mlatclient @@ -14,7 +14,7 @@ # 4. Also in the same RUN command for your target image, do this: # tar zxf /downloader/mlatclient.tgz -C / && \ # ---------------------------------------------------------------------------------------- -FROM debian:bookworm-20241111-slim +FROM debian:bookworm-20241223-slim ENV MLATCLIENT_REPO="https://github.com/wiedehopf/mlat-client.git" diff --git a/README.md b/README.md index 6de401e6..20eb8863 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Provide a basic image, with all normal packages common to all installs of [miken 1) Create your new docker file 2) [Update github actions](Add-New-Container-Template.MD) 3) Update the [Tags](#tags) section -4) Update the [Projects and Tag Tree](#Projects-and-Tag-Tree) section +4) Update the [Projects and Tag Tree](#projects-and-tag-tree) section ## Tags @@ -52,7 +52,7 @@ RUN ... | Tag | Sub-tags Using | Up-Stream Projects Using | | ----------------- | ------------------------------ | ------------------------ | -| `base` | `ALL` | [sdr-enthusiasts/acars_router][acars_router],[sdr-enthusiasts/airspy-adsb][airspy], [sdr-enthusiasts/docker-radarbox][docker-radarbox], [sdr-enthusiasts/docker-adsbhub][docker-adsbhub], [sdr-enthusiasts/docker-opensky-network][docker-opensky-network], [sdr-enthusiasts/docker-rtlsdrairband][docker-rtlsdrairband] | +| `base` | `ALL` | [sdr-enthusiasts/acars_router][acars_router],[sdr-enthusiasts/airspy-adsb][airspy], [sdr-enthusiasts/docker-airnavradar][docker-airnavradar], [sdr-enthusiasts/docker-adsbhub][docker-adsbhub], [sdr-enthusiasts/docker-opensky-network][docker-opensky-network], [sdr-enthusiasts/docker-rtlsdrairband][docker-rtlsdrairband] | | `acars-decoder` | - | [sdr-enthusiasts/docker-acarsdec][docker-acarsdec], [sdr-enthusiasts/docker-dumpvdl2][docker-dumpvdl2], [sdr-enthusiasts/docker-vdlm2dec][docker-vdlm2dec] | | `python` | - | [sdr-enthusiasts/docker-acarshub][docker-acarshub], [sdr-enthusiasts/docker-adsbexchange][docker-adsbexchange], [kx1t/docker-planefence][docker-planefence], [sdr-enthusiasts/docker-radarvirtuel][docker-radarvirtuel], [sdr-enthusiasts/docker-reversewebproxy][docker-reversewebproxy], [kx1t/docker-raspberry-noaa-v2][docker-raspberry-noaa-v2] | | `rtlsdr` | `acars-decoder`, `readsb-full`, `soapyrtlsdr`, `wreadsb` | [sdr-enthusiasts/acars-oxide][acars-oxide] | @@ -83,7 +83,7 @@ RUN ... [docker-piaware]: https://github.com/sdr-enthusiasts/docker-piaware [docker-planefence]: http://github.com/kx1t/docker-planefence [docker-planefinder]: https://github.com/sdr-enthusiasts/docker-planefinder -[docker-radarbox]: https://github.com/sdr-enthusiasts/docker-radarbox +[docker-airnavradar]: https://github.com/sdr-enthusiasts/docker-airnavradar [docker-radarvirtuel]: https://github.com/sdr-enthusiasts/docker-radarvirtuel [docker-raspberry-noaa-v2]: https://github.com/kx1t/docker-raspberry-noaa-v2 [docker-readsb-protobuf]: https://github.com/sdr-enthusiasts/docker-readsb-protobuf diff --git a/SDR-Containers.MD b/SDR-Containers.MD index 464656f9..a4f25908 100644 --- a/SDR-Containers.MD +++ b/SDR-Containers.MD @@ -8,7 +8,7 @@ All links will be for the `:latest` tag for each container. | Name | DockerHub URL | GHCR URL | | ----------------- | ------------------------------ | ------------------------ | -| [docker-readsb-protobuf](https://github.com/sdr-enthusiasts/docker-readsb-protobuf)| `mikenye/readsb-protobuf` | `ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest` | | +| [docker-readsb-protobuf](https://github.com/sdr-enthusiasts/docker-readsb-protobuf)| `mikenye/readsb-protobuf` | `ghcr.io/sdr-enthusiasts/docker-readsb-protobuf:latest` | | [docker-dump978](https://github.com/sdr-enthusiasts/docker-dump978) | `mikenye/dump978` |`ghcr.io/sdr-enthusiasts/docker-dump978:latest` | | [docker-adsb-ultrafeeder](https://github.com/sdr-enthusiasts/docker-adsb-ultrafeeder) | `none` | `ghcr.io/sdr-enthusiasts/docker-adsb-ultrafeeder:latest` | @@ -22,7 +22,7 @@ All links will be for the `:latest` tag for each container. | [docker-opensky-network](https://github.com/sdr-enthusiasts/docker-opensky-network) | `mikenye/opensky-network` | `ghcr.io/sdr-enthusiasts/docker-opensky-network:latest` | | [docker-piaware](https://github.com/sdr-enthusiasts/docker-piaware) | `mikenye/piaware` | `ghcr.io/sdr-enthusiasts/docker-piaware:latest` | | [docker-planefinder](https://github.com/sdr-enthusiasts/docker-planefinder) | `mikenye/planefinder` | `ghcr.io/sdr-enthusiasts/docker-planefinder:latest` | -| [docker-radarbox](https://github.com/sdr-enthusiasts/docker-radarbox) | `mikenye/radarbox` | `ghcr.io/sdr-enthusiasts/docker-radarbox:latest` | +| [docker-airnavradar](https://github.com/sdr-enthusiasts/docker-airnavradar) | `mikenye/radarbox` | `ghcr.io/sdr-enthusiasts/docker-airnavradar:latest` | | [docker-radarvirtuel](https://github.com/sdr-enthusiasts/docker-radarvirtuel) | `kx1t/radarvirtuel` | `ghcr.io/sdr-enthusiasts/docker-radarvirtuel:latest` | ## ACARS