Merge pull request #1012 from guydavis/develop

guydavis · web-flow · commit 9e698893ccf5 · 2025-02-16T10:23:42.000-07:00
Chia v2.5.1on Ubuntu 24.04
diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml
@@ -3,6 +3,44 @@ 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
+
   docker-jammy:
     runs-on: ubuntu-22.04
     steps:
diff --git 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,10 +86,10 @@ 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"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=compress"
           tags: |
diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml
@@ -3,6 +3,44 @@ name: release-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:latest
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:latest
+
   docker-jammy:
     runs-on: ubuntu-22.04
     steps:
diff --git a/.github/workflows/main-chia.yaml b/.github/workflows/main-chia.yaml
@@ -42,9 +42,9 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=latest"
-            "CHIA_BRANCH=2.4.3"
+            "CHIA_BRANCH=2.5.1"
             "BLADEBIT_BRANCH=master"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris:latest
@@ -89,7 +89,7 @@ jobs:
           build-args: |
             "UBUNTU_VER=jammy"
             "MACHINARIS_STREAM=latest"
-            "GIGAHORSE_BRANCH=v2.5.0.giga36"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
             "CHIA_BRANCH=main"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-gigahorse:latest
diff --git a/.github/workflows/main-mmx.yaml b/.github/workflows/main-mmx.yaml
@@ -46,7 +46,7 @@ jobs:
             "MACHINARIS_STREAM=latest"
             "CHIA_BRANCH=latest"
             "MMX_BRANCH=v0.10.6"
-            "GIGAHORSE_BRANCH=v2.5.0.giga36"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:latest
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:v${{ github.event.inputs.version }}
diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml
@@ -3,6 +3,44 @@ name: test-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:test
+            ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:test
+
   docker-jammy:
     runs-on: ubuntu-22.04
     steps:
diff --git a/.github/workflows/test-chia.yaml b/.github/workflows/test-chia.yaml
@@ -41,10 +41,10 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "CHIA_BRANCH=2.4.3"
+            "CHIA_BRANCH=2.5.1"
             "PLOTMAN_BRANCH=development"
             "BLADEBIT_BRANCH=master"
           tags: |
@@ -86,10 +86,10 @@ jobs:
           provenance: false
           push: true
           build-args: |
-            "UBUNTU_VER=jammy"
+            "UBUNTU_VER=noble"
             "MACHINARIS_STREAM=test"
             "CHIADOG_BRANCH=dev"
-            "GIGAHORSE_BRANCH=v2.5.0.giga36"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
             "CHIA_BRANCH=main"
             "PLOTMAN_BRANCH=development"
           tags: |
diff --git a/.github/workflows/test-mmx.yaml b/.github/workflows/test-mmx.yaml
@@ -46,7 +46,7 @@ jobs:
             "CHIA_BRANCH=latest"
             "PLOTMAN_BRANCH=development"
             "MMX_BRANCH=v0.10.6"
-            "GIGAHORSE_BRANCH=v2.5.0.giga36"
+            "GIGAHORSE_BRANCH=v2.5.1.giga36"
           tags: |
             ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
             ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-mmx:test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.1] - 2025-02-17
+### Added
+### Changed
+ - For Chia and Gigahorse, install them on the latest Ubuntu 24.04 (Noble) Docker image.
+### Updated
+ - [Cactus](https://github.com/Cactus-Network/cactus-blockchain/releases/tag/v2.5.0) to v2.5.0
+ - [Chia](https://github.com/Chia-Network/chia-blockchain/releases/tag/2.5.1) to v2.5.1 - Upgrade recommended as pooling just broke in Chia v2.5.0
+ - [Gigahorse](https://github.com/madMAx43v3r/chia-gigahorse/releases/tag/v2.5.1.giga36) to v2.5.1.giga36.  NOTE: Only for AMD64, so ARM64 uses an old version.
+
 ## [2.5.0] - 2025-01-04
 ### Added
  - New check to restart a farmer if pooling and no partials have been observed in the last hour.  Thanks @aweigold!
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.5.1
diff --git 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
@@ -0,0 +1,55 @@
+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-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/*
diff --git a/scripts/forks/cactus_install.sh b/scripts/forks/cactus_install.sh
@@ -4,8 +4,8 @@
 #
 
 CACTUS_BRANCH=$1
-# On 2024-01-24
-HASH=a1b033bfed034a699e14bd93ed356b7f8207e077
+# On 2025-01-15
+HASH=4a8cab070bab126c9246d1fb50450062fdf10abd
 
 if [ -z ${CACTUS_BRANCH} ]; then
     echo 'Skipping Cactus install as not requested.'
diff --git a/scripts/forks/chia_install.sh b/scripts/forks/chia_install.sh
@@ -27,10 +27,10 @@ else
     echo "Installing Chia CUDA binaries on ${arch_name}..."
     cd /tmp
     if [[ "${arch_name}" == "x86_64" ]]; then
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.0/chia-blockchain-cli_2.5.0-1_amd64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.1/chia-blockchain-cli_2.5.1-1_amd64.deb
         apt-get install ./chia-blockchain-cli*.deb
     else
-        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.0/chia-blockchain-cli_2.5.0-1_arm64.deb
+        curl -sLJO https://github.com/Chia-Network/chia-blockchain/releases/download/2.5.1/chia-blockchain-cli_2.5.1-1_arm64.deb
         apt-get install ./chia-blockchain-cli*.deb
     fi
 
diff --git a/scripts/forks/gigahorse_install.sh b/scripts/forks/gigahorse_install.sh
@@ -24,7 +24,7 @@ else
         tar -xzf chia-gigahorse-farmer*
     else
         # Max broke ARM64 support in v2.4.4.giga36, have to downgrade to 2.4.1
-        if [[ "${GIGAHORSE_BRANCH}" == "v2.5.0.giga36" ]]; then
+        if [[ "${GIGAHORSE_BRANCH}" == "v2.5.1.giga36" ]]; then
             GIGAHORSE_BRANCH="v2.4.1.giga36"  # old version
             GIGAHORSE_VERSION=${GIGAHORSE_BRANCH#?}
         fi
