From 2e40f88d52345f2656d97ce4e4cf1c867d30b911 Mon Sep 17 00:00:00 2001
From: Egor Tensin <egor@tensin.name>
Date: Sun, 10 Dec 2023 14:12:22 +0100
Subject: fix target architectures & links

On https://www.flightradar24.com/share-your-data, the Raspberry Pi link
now points to arm64 builds only. Also, download links for Linux packages
are different now.
---
 .github/workflows/ci.yml |  2 +-
 Makefile                 |  2 +-
 fr24feed/Dockerfile      | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73fdba9..b09c424 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,6 +52,6 @@ jobs:
         with:
           context: '${{ matrix.project }}'
           file: '${{ matrix.project }}/Dockerfile'
-          platforms: i386,amd64,armhf
+          platforms: i386,amd64,arm64
           push: true
           tags: '${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.project }}:latest'
diff --git a/Makefile b/Makefile
index 7cda09c..89dff72 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ DO:
 
 PROJECT := fr24feed
 # Target platforms (used by buildx):
-PLATFORMS := i386,amd64,armhf
+PLATFORMS := i386,amd64,arm64
 # Docker Hub credentials:
 DOCKER_USERNAME := egortensin
 # This is still required with older Compose versions to use TARGETARCH:
diff --git a/fr24feed/Dockerfile b/fr24feed/Dockerfile
index e13eb0b..71479a5 100644
--- a/fr24feed/Dockerfile
+++ b/fr24feed/Dockerfile
@@ -6,26 +6,26 @@ FROM debian:bullseye-slim AS base
 # repository) was unsuitable (no systemctl in the container, etc.).
 # Using BuildKit is required for this to work (it exposes TARGETARCH).
 
-# The latest versions of the fr24feed binary for i386/x86_64/armhf according
+# The latest versions of the fr24feed binary for i386/x86_64/arm64 according
 # to:
 #
 #     https://www.flightradar24.com/share-your-data
 #
 # as of 2023-12-10.
 FROM base AS env-386
-ENV fr24feed_directory=linux_x86_binaries
+ENV fr24feed_directory=linux_binaries
 ENV fr24feed_version=1.0.44-0
 ENV fr24feed_archive_suffix=i386
 
 FROM base AS env-amd64
-ENV fr24feed_directory=linux_x86_64_binaries
+ENV fr24feed_directory=linux_binaries
 ENV fr24feed_version=1.0.44-0
 ENV fr24feed_archive_suffix=amd64
 
-FROM base AS env-arm
+FROM base AS env-arm64
 ENV fr24feed_directory=rpi_binaries
 ENV fr24feed_version=1.0.44-0
-ENV fr24feed_archive_suffix=armhf
+ENV fr24feed_archive_suffix=arm64
 
 ARG TARGETARCH
 FROM env-$TARGETARCH AS builder
-- 
cgit v1.2.3