From ba42624aa759bc33f4fc0d0e475cb99d360f082c Mon Sep 17 00:00:00 2001
From: Kyle Harding <kyle@balena.io>
Date: Wed, 12 Feb 2025 14:30:41 -0500
Subject: [PATCH] Remove runner distro requirement from build and test

Ubuntu Focal 20.04 is EOL in May 2025 and open-balena-base
has been based on Debian Bookworm since July 2023.

Since we are building in a golang bookworm container for GLIBC
compatibility anyway, there is no need to limit the runners to
any specific distro.

Change-type: minor
Signed-off-by: Kyle Harding <kyle@balena.io>
---
 .github/actions/publish/action.yml |  1 +
 .github/workflows/flowzone.yml     | 11 -----------
 Dockerfile                         |  4 +++-
 docker-compose.test.yml            |  5 ++---
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
index fd3160e..f68c437 100644
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@@ -18,6 +18,7 @@ runs:
   steps:
     - shell: bash
       run: |
+        docker compose -f docker-compose.test.yml build
         docker compose -f docker-compose.test.yml run sut \
           'git config --global --add safe.directory $(pwd); make -j $(nproc) dep release'
 
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 2945e48..624c808 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -20,14 +20,3 @@ jobs:
         github.event_name == 'pull_request_target'
       )
     secrets: inherit
-    with:
-      docker_images: ""
-      # open-balena-base/GLIBC compatibility
-      custom_test_matrix: >
-        {
-          "os": [["ubuntu-20.04"]]
-        }
-      docker_runs_on: |
-        {
-          "linux/amd64": ["ubuntu-20.04"]
-        }
diff --git a/Dockerfile b/Dockerfile
index 853b042..f18874f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1 +1,3 @@
-FROM golang:1.23.5
+
+# retain GLIBC compatibility with debian:bookworm used by open-balena-base
+FROM golang:1.23.5-bookworm
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 2b933a9..53f764c 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -1,9 +1,8 @@
----
-version: "2.4"
 
 services:
   sut:
-    image: golang:1.23.5
+    build: .
+    image: sut
     volumes:
       - .:/go/src/github.com/balena-io/sshproxy
     working_dir: /go/src/github.com/balena-io/sshproxy