From 0fea8d3168c3d99ece6f4ddb97a4e2a0a82b7e10 Mon Sep 17 00:00:00 2001
From: Marc Cataford <mcat@riseup.net>
Date: Sun, 28 Jul 2024 23:40:55 -0400
Subject: [PATCH] feat: add ubuntu-2404 based image

---
 .forgejo/workflows/ci.yml                |  2 +-
 images/ubuntu-2404/Dockerfile            | 44 ++++++++++++++++++++++++
 images/ubuntu-2404/files/registries.conf |  3 ++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 images/ubuntu-2404/Dockerfile
 create mode 100644 images/ubuntu-2404/files/registries.conf

diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml
index d5870df..2872e3b 100644
--- a/.forgejo/workflows/ci.yml
+++ b/.forgejo/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image-name: ['ubuntu-2204']
+        image-name: ['ubuntu-2204', 'ubuntu-2404']
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
diff --git a/images/ubuntu-2404/Dockerfile b/images/ubuntu-2404/Dockerfile
new file mode 100644
index 0000000..b848772
--- /dev/null
+++ b/images/ubuntu-2404/Dockerfile
@@ -0,0 +1,44 @@
+FROM ubuntu:24.04 as skeleton
+
+ENV NODE_VERSION "20.12.2"
+ENV NVM_VERSION "0.37.2"
+
+ENV DEBIAN_FRONTEND noninteractive
+ENV TZ Etc/UTC
+
+RUN apt update && \
+        apt upgrade -y && \
+        apt install -y \
+            curl \
+            podman \
+            jq \
+            git \
+            xz-utils \
+            ca-certificates \
+            python3 \
+            python3-venv \
+            python3-pip \
+            pipx \
+            --no-install-recommends \
+            --autoremove && \
+            apt-get clean
+
+COPY ./files/registries.conf /etc/containers/registries.conf
+
+FROM skeleton as runner
+
+WORKDIR /runner
+
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
+
+RUN . $HOME/.nvm/nvm.sh && \
+    nvm install $NODE_VERSION && \
+    nvm use $NODE_VERSION && \
+    nvm cache clear
+
+ENV NVM_DIR $HOME/.nvm
+ENV PATH /root/.nvm/versions/node/v$NODE_VERSION/bin:$PATH
+
+RUN node --version
+
+RUN corepack enable
diff --git a/images/ubuntu-2404/files/registries.conf b/images/ubuntu-2404/files/registries.conf
new file mode 100644
index 0000000..067d712
--- /dev/null
+++ b/images/ubuntu-2404/files/registries.conf
@@ -0,0 +1,3 @@
+[[registry]]
+insecure = true
+location = "host.containers.internal:5000"