From c8ab7051afe03576f12789ed3fdbdaf63155ac59 Mon Sep 17 00:00:00 2001 From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com> Date: Tue, 18 Feb 2025 13:40:45 +0000 Subject: [PATCH] revert: update containers and CI to use Ubuntu 24.04 LTS (`noble`) partial revert 9b4c95e85865ce5b4a3dcb24bb41cf15279f35a8 --- .github/workflows/release_docker_hub.yml | 2 +- contrib/containers/deploy/Dockerfile | 2 +- contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch | 4 ++-- contrib/containers/deploy/Dockerfile.GitHubActions.Release | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release_docker_hub.yml b/.github/workflows/release_docker_hub.yml index e9f157ab6aab9..bbdf7551928b0 100644 --- a/.github/workflows/release_docker_hub.yml +++ b/.github/workflows/release_docker_hub.yml @@ -7,7 +7,7 @@ on: jobs: release: name: Release to Docker Hub - runs-on: ubuntu-24.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v3 diff --git a/contrib/containers/deploy/Dockerfile b/contrib/containers/deploy/Dockerfile index 847ed1a93b99b..06e9b6aacfff7 100644 --- a/contrib/containers/deploy/Dockerfile +++ b/contrib/containers/deploy/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/baseimage:noble-1.0.0 +FROM phusion/baseimage:jammy-1.0.4 LABEL maintainer="Dash Developers " LABEL description="Dockerised DashCore, built from CI" diff --git a/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch b/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch index 370e870399db1..4db05ed6c25f5 100644 --- a/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch +++ b/contrib/containers/deploy/Dockerfile.GitHubActions.Dispatch @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1.3 -FROM --platform=$BUILDPLATFORM ubuntu:noble as builder +FROM --platform=$BUILDPLATFORM ubuntu:jammy as builder RUN apt-get update && \ apt-get -y install --no-install-recommends \ automake \ @@ -42,7 +42,7 @@ RUN mkdir built-target && \ "linux/amd64") cp depends/x86_64-pc-linux-gnu/bin/dash* /home/dash/built-target ;; \ esac -FROM ubuntu:noble +FROM ubuntu:jammy LABEL maintainer="Dash Developers " LABEL description="Dockerised DashCore" diff --git a/contrib/containers/deploy/Dockerfile.GitHubActions.Release b/contrib/containers/deploy/Dockerfile.GitHubActions.Release index 498f422241098..c32bada29c588 100644 --- a/contrib/containers/deploy/Dockerfile.GitHubActions.Release +++ b/contrib/containers/deploy/Dockerfile.GitHubActions.Release @@ -1,4 +1,4 @@ -FROM ubuntu:noble +FROM ubuntu:jammy LABEL maintainer="Dash Developers " LABEL description="Dockerised DashCore"