From 445391eb5013dd0893f133018bd511c58dcf0331 Mon Sep 17 00:00:00 2001
From: Guy Davis <guydavis.ca@gmail.com>
Date: Tue, 11 Feb 2025 16:20:54 -0700
Subject: [PATCH] Test building on Ubuntu 24.04

---
 .github/workflows/develop-base.yaml | 39 ++++++++++++++++++++
 .github/workflows/develop-chia.yaml |  6 ++--
 docker/dockerfile                   |  2 +-
 docker/dockerfile-noble.base        | 56 +++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 docker/dockerfile-noble.base

diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
index 4168ebd2..bec2ab34 100644
--- a/.github/workflows/develop-base.yaml
+++ b/.github/workflows/develop-base.yaml
@@ -2,6 +2,45 @@ name: develop-base
 
 on: workflow_dispatch
 
+jobs:
+  docker-noble:
+    runs-on: ubuntu-24.04
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - 
+        name: Login to DockerHub
+        uses: docker/login-action@v2 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Login to GitHub Container Registry
+        uses: docker/login-action@v2 
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Build and push
+        uses: docker/build-push-action@v4
+        with:
+          file: docker/dockerfile-noble.base
+          context: .
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          tags: |
+            ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop
+
 jobs:
   docker-jammy:
     runs-on: ubuntu-22.04
diff --git a/.github/workflows/develop-chia.yaml b/.github/workflows/develop-chia.yaml
index baa4b0b0..6f9076c4 100644
--- a/.github/workflows/develop-chia.yaml
+++ b/.github/workflows/develop-chia.yaml
@@ -41,10 +41,10 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=2.4.3"
+            "CHIA_BRANCH=2.5.1"
             "BLADEBIT_BRANCH=master"
             "PLOTMAN_BRANCH=compress"
           tags: |
@@ -86,7 +86,7 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=develop"
             "CHIADOG_BRANCH=dev"
             "GIGAHORSE_BRANCH=v2.5.0.giga36"
diff --git a/docker/dockerfile b/docker/dockerfile
index 962e823a..7503cb21 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -1,4 +1,4 @@
-ARG UBUNTU_VER=jammy
+ARG UBUNTU_VER=noble
 ARG MACHINARIS_STREAM=main
 
 FROM ghcr.io/guydavis/machinaris-base-${UBUNTU_VER}:${MACHINARIS_STREAM}
diff --git a/docker/dockerfile-noble.base b/docker/dockerfile-noble.base
new file mode 100644
index 00000000..58a34333
--- /dev/null
+++ b/docker/dockerfile-noble.base
@@ -0,0 +1,56 @@
+ARG UBUNTU_VER="noble"
+
+FROM ubuntu:${UBUNTU_VER} as package_stage
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+	&& apt-get install -y \
+		acl \
+		apt \
+		bash \
+		bc \
+		ca-certificates \
+		cifs-utils \
+		cmake \
+		curl \
+		git \
+		iproute2 \
+		iputils-ping \
+		jq \
+		libsqlite3-dev \
+		locales \
+		locales-all \
+		logrotate \
+		lsb-release \
+		openssl \
+		p7zip-full \
+		p7zip-rar \
+		psmisc \
+		python3 \
+		python3.10-distutils \
+		python3.10-venv \
+		python3-dev \
+		python3-pip \
+		python3-libtorrent \ 
+		python-is-python3 \
+		smartmontools \
+		sqlite3 \
+		sudo \
+		tar \
+		tzdata \
+		unrar \
+		unzip \
+		vim \
+		wget \
+	\
+# update smartmontools drive db
+	\
+	&& /usr/sbin/update-smart-drivedb \
+	\
+# cleanup apt cache
+	\
+	&& rm -rf \
+		/tmp/* \
+		/var/lib/apt/lists/* \
+		/var/tmp/*