From 99489a86cb7267615c120627b374ff652cbc0719 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 16 Feb 2025 13:37:30 -0700 Subject: [PATCH 1/4] Fixes for building Cactus on Noble. --- .github/workflows/develop-blockchains.yaml | 2 +- .github/workflows/main-blockchains.yaml | 4 ++-- .github/workflows/test-blockchains.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/develop-blockchains.yaml b/.github/workflows/develop-blockchains.yaml index 0cc213c7..97a66981 100644 --- a/.github/workflows/develop-blockchains.yaml +++ b/.github/workflows/develop-blockchains.yaml @@ -41,7 +41,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=jammy" + "UBUNTU_VER=noble" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" "FDCLI_BRANCH=dev" diff --git a/.github/workflows/main-blockchains.yaml b/.github/workflows/main-blockchains.yaml index 2d03ca01..9d717f09 100644 --- a/.github/workflows/main-blockchains.yaml +++ b/.github/workflows/main-blockchains.yaml @@ -38,7 +38,7 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | @@ -129,7 +129,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=jammy" + "UBUNTU_VER=noble" "MACHINARIS_STREAM=latest" "GIGAHORSE_BRANCH=v2.5.1.giga36" "CHIA_BRANCH=main" diff --git a/.github/workflows/test-blockchains.yaml b/.github/workflows/test-blockchains.yaml index a0cac58e..54770aa9 100644 --- a/.github/workflows/test-blockchains.yaml +++ b/.github/workflows/test-blockchains.yaml @@ -37,7 +37,7 @@ jobs: with: file: docker/dockerfile context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 provenance: false push: true build-args: | From 9348b1c96cd6425ce24844bcebdfe2b3ff917366 Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 16 Feb 2025 13:42:29 -0700 Subject: [PATCH 2/4] Cactus fails to build on Noble, back to Jammy. --- .github/workflows/develop-blockchains.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/develop-blockchains.yaml b/.github/workflows/develop-blockchains.yaml index 97a66981..fd4d2eba 100644 --- a/.github/workflows/develop-blockchains.yaml +++ b/.github/workflows/develop-blockchains.yaml @@ -7,7 +7,7 @@ on: jobs: cactus: - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -41,7 +41,7 @@ jobs: provenance: false push: true build-args: | - "UBUNTU_VER=noble" + "UBUNTU_VER=jammy" "MACHINARIS_STREAM=develop" "CHIADOG_BRANCH=dev" "FDCLI_BRANCH=dev" From 8d35e0d1dd13f1f7158331b2e12ba6d19af73adc Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 16 Feb 2025 14:00:53 -0700 Subject: [PATCH 3/4] Try building on 24.04 for Jammy --- .github/workflows/develop-base.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml index 1aa04dd6..f2c7adf8 100644 --- a/.github/workflows/develop-base.yaml +++ b/.github/workflows/develop-base.yaml @@ -42,7 +42,7 @@ jobs: ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:develop docker-jammy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout From c899ee0d14ac3ba7c123dfcf4fd849b8d5255acc Mon Sep 17 00:00:00 2001 From: Guy Davis Date: Sun, 16 Feb 2025 14:09:38 -0700 Subject: [PATCH 4/4] Deprecate old Ubuntu 20.04 (Focal) --- .github/workflows/develop-base.yaml | 38 -------------------- .github/workflows/main-base.yaml | 39 +-------------------- .github/workflows/test-base.yaml | 38 +------------------- docker/dockerfile-focal.base | 54 ----------------------------- 4 files changed, 2 insertions(+), 167 deletions(-) delete mode 100644 docker/dockerfile-focal.base diff --git a/.github/workflows/develop-base.yaml b/.github/workflows/develop-base.yaml index f2c7adf8..edc1804b 100644 --- a/.github/workflows/develop-base.yaml +++ b/.github/workflows/develop-base.yaml @@ -78,41 +78,3 @@ jobs: tags: | ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:develop - - docker-focal: - runs-on: ubuntu-20.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-focal.base - context: . - platforms: linux/amd64 - provenance: false - push: true - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:develop diff --git a/.github/workflows/main-base.yaml b/.github/workflows/main-base.yaml index 030989c2..d95679f7 100644 --- a/.github/workflows/main-base.yaml +++ b/.github/workflows/main-base.yaml @@ -42,7 +42,7 @@ jobs: ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:latest docker-jammy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout @@ -79,40 +79,3 @@ jobs: ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:latest ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:latest - docker-focal: - runs-on: ubuntu-20.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-focal.base - context: . - platforms: linux/amd64,linux/arm64 - provenance: false - push: true - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:latest - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:latest diff --git a/.github/workflows/test-base.yaml b/.github/workflows/test-base.yaml index 3d144c4a..0a323f0d 100644 --- a/.github/workflows/test-base.yaml +++ b/.github/workflows/test-base.yaml @@ -42,7 +42,7 @@ jobs: ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-noble:test docker-jammy: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout @@ -79,39 +79,3 @@ jobs: ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:test ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-jammy:test - docker-focal: - runs-on: ubuntu-20.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-focal.base - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:test - ghcr.io/${{ secrets.DOCKERHUB_USERNAME }}/machinaris-base-focal:test diff --git a/docker/dockerfile-focal.base b/docker/dockerfile-focal.base deleted file mode 100644 index 41461e9a..00000000 --- a/docker/dockerfile-focal.base +++ /dev/null @@ -1,54 +0,0 @@ -ARG UBUNTU_VER="focal" - -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 \ - curl \ - git \ - iproute2 \ - iputils-ping \ - jq \ - libsqlite3-dev \ - locales \ - locales-all \ - logrotate \ - lsb-release \ - openssl \ - p7zip-full \ - p7zip-rar \ - psmisc \ - python3 \ - python3.9-distutils \ - python3.9-venv \ - python3-dev \ - python3-pip \ - 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/*