Merge pull request #103 from pi-hole/ftl-build/dnspython

Update ftl-build container

Author: dschaper

.github/workflows/ftl-build.yml

@@ -1,18 +1,21 @@
 name: ftl-build builds
 on:
-  pull_request:
-    paths:
-      - 'ftl-build/**'
-      - '.github/workflows/ftl-build.yml'
   push:
     branches:
       - '**'
-    tags:
-      - "**"
     paths:
       - 'ftl-build/**'
       - '.github/workflows/ftl-build.yml'
       - '.github/actions/**'
+    # Only run on push events to the main repository (not from forks)
+  pull_request:
+    types: [opened, synchronize, reopened]
+    paths:
+      - 'ftl-build/**'
+      - '.github/workflows/ftl-build.yml'
+    # Only run on PRs from forks
+    branches:
+      - '**'
   workflow_dispatch:
   schedule:
     # 1:30am UTC every Sunday, has no particular significance
@@ -24,17 +27,26 @@ env:
 
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    if: |
+      (github.event_name == 'push' && github.repository == 'pi-hole/docker-base-images') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository)
     strategy:
       fail-fast: false
       matrix:
         include:
           - platform: linux/amd64
+            runner: ubuntu-24.04
           - platform: linux/386
+            runner: ubuntu-24.04
           - platform: linux/arm/v6
+            runner: ubuntu-24.04-arm
           - platform: linux/arm/v7
+            runner: ubuntu-24.04-arm
           - platform: linux/arm64/v8
+            runner: ubuntu-24.04-arm
           - platform: linux/riscv64
+            runner: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
     steps:
       -
         name: Prepare name for digest up/download

ftl-build/Dockerfile

@@ -1,18 +1,19 @@
-ARG CONTAINER="alpine:3.21"
+ARG CONTAINER="alpine:3.22"
 FROM ${CONTAINER} AS builder
 
 ARG TARGETPLATFORM
 ARG readlineversion=8.2
 ARG termcapversion=1.3.1
 ARG nettleversion=3.10.1
-ARG mbedtlsversion=3.6.2
+ARG mbedtlsversion=3.6.3.1
 
 RUN apk add --no-cache \
         alpine-sdk \
         bash \
         bind-tools \
         curl \
         gmp-dev \
+        gmp-static \
         libcap \
         linux-headers \
         openssh-client \
@@ -40,10 +41,11 @@ RUN apk add --no-cache \
         gdb \
         py3-jinja2 \
         py3-jsonschema \
-        ncurses
+        ncurses \
+        py3-dnspython
 
-ENV STATIC true
-ENV TEST true
+ENV STATIC=true
+ENV TEST=true
 
 # As of Alpine 3.21 (Dec 2024), we need to patch the termcap library to include
 # the standard headers as well as unistd.h for the write function