From 03f41273e16646903cbc02f7b77a9891af96fc7a Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Tue, 21 Jan 2025 11:29:48 +0100
Subject: [PATCH] feat(act): switch to ubuntu base images

---
 .forgejo/workflows/act_runtime.yaml | 8 ++++----
 act_runtime/Dockerfile              | 9 ++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.forgejo/workflows/act_runtime.yaml b/.forgejo/workflows/act_runtime.yaml
index 5bdf23d..a5c3ef3 100644
--- a/.forgejo/workflows/act_runtime.yaml
+++ b/.forgejo/workflows/act_runtime.yaml
@@ -11,8 +11,8 @@ on:
       - "act_runtime/**"
 
 env:
-  TAGS: '{"ubuntu-latest": {"node:20-bullseye-slim": "20.04-arm64","node:20-bookworm-slim": "arm64"},"ubuntu-latest-amd64": {"node:20-bullseye-slim": "20.04-amd64","node:20-bookworm-slim": "amd64"}}'
-  VERSIONS: '{"node:20-bullseye-slim": {"llvm": "13"},"node:20-bookworm-slim": {"llvm": "16"}}'
+  TAGS: '{"ubuntu-latest": {"ubuntu:20.04": "20.04-arm64","ubuntu:24.04": "arm64"},"ubuntu-latest-amd64": {"ubuntu:20.04": "20.04-amd64","ubuntu:24.04": "amd64"}}'
+  VERSIONS: '{"ubuntu:20.04": {"llvm": "13"},"ubuntu:24.04": {"llvm": "16"}}'
 
 jobs:
   build_images:
@@ -22,8 +22,8 @@ jobs:
           - ubuntu-latest
           - ubuntu-latest-amd64
         base:
-          - node:20-bullseye-slim
-          - node:20-bookworm-slim
+          - ubuntu:20.04
+          - ubuntu:24.04
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
diff --git a/act_runtime/Dockerfile b/act_runtime/Dockerfile
index c6532e6..d6a1e0e 100644
--- a/act_runtime/Dockerfile
+++ b/act_runtime/Dockerfile
@@ -1,11 +1,13 @@
 # syntax=docker/dockerfile:1
-ARG BASE_IMAGE=node:23-bookworm-slim
+ARG BASE_IMAGE=ubuntu:24.04
 
 FROM ${BASE_IMAGE}
 
 ARG LLVM_VERSION=16
 ARG TARGETARCH
 
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+
 # common tools
 RUN --mount=type=cache,target=/var/lib/apt \
     --mount=type=cache,target=/var/lib/cache \
@@ -25,6 +27,7 @@ RUN --mount=type=cache,target=/var/lib/apt \
     libbpf-dev \
     make \
     unzip \
+    nodejs \
     libgraphite2-3 \
     zstd && \
     ln -s /usr/lib/llvm-${LLVM_VERSION}/bin/clang /usr/bin/clang && \
@@ -39,11 +42,11 @@ RUN --mount=type=cache,target=/var/lib/apt \
     --mount=type=cache,target=/var/cache/apt \
     echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" > /etc/apt/sources.list.d/github-cli.list && \
     echo \
-    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list && \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list && \
     apt-get update && \
     apt-get install -y \
     gh \
-    docker-ce docker-ce-cli containerd.io docker-buildx-plugin
+    docker-ce-cli docker-buildx-plugin
 
 # AWS CLI
 RUN --mount=type=cache,target=/tmp \