From ccd9beb661e405ab73c702abb0a30a82728edbcd Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Sat, 13 Apr 2024 12:39:03 -0700
Subject: [PATCH] util-docker: Remove 22.04 min-dep Dockerfile

We only test the latest LTS Ubuntu release with min-deps. With 24.04, we
no longer require the 22.04 min dependencies image.

Change-Id: I4b3d668c1f9d10c2b6071848e6daada6c763b5e7
---
 util/dockerfiles/docker-bake.hcl              |  9 +-----
 util/dockerfiles/docker-compose.yaml          |  5 ---
 .../ubuntu-22.04_min-dependencies/Dockerfile  | 31 -------------------
 3 files changed, 1 insertion(+), 44 deletions(-)
 delete mode 100644 util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile

diff --git a/util/dockerfiles/docker-bake.hcl b/util/dockerfiles/docker-bake.hcl
index 9b999124b6..7092d9cdb1 100644
--- a/util/dockerfiles/docker-bake.hcl
+++ b/util/dockerfiles/docker-bake.hcl
@@ -44,7 +44,7 @@ group "default" {
 }
 
 group "ubuntu-releases" {
-  targets=["ubuntu-24-04_all-dependencies", "ubuntu-22-04_all-dependencies", "ubuntu-20-04_all-dependencies", "ubuntu-22-04_min-dependencies", "ubuntu-24-04_min-dependencies"]
+  targets=["ubuntu-24-04_all-dependencies", "ubuntu-22-04_all-dependencies", "ubuntu-20-04_all-dependencies", "ubuntu-24-04_min-dependencies"]
 }
 
 group "clang-compilers" {
@@ -126,13 +126,6 @@ target "ubuntu-24-04_min-dependencies" {
   tags = ["${IMAGE_URI}/ubuntu-24.04_min-dependencies:${TAG}"]
 }
 
-target "ubuntu-22-04_min-dependencies" {
-  inherits = ["common"]
-  dockerfile = "Dockerfile"
-  context = "ubuntu-22.04_min-dependencies"
-  tags = ["${IMAGE_URI}/ubuntu-22.04_min-dependencies:${TAG}"]
-}
-
 target "gcc-compilers-base-20-04" {
   name = "gcc-compilers-${replace(ver, ".", "-")}"
   inherits = ["common"]
diff --git a/util/dockerfiles/docker-compose.yaml b/util/dockerfiles/docker-compose.yaml
index b3c39cbd31..dca22c8e18 100644
--- a/util/dockerfiles/docker-compose.yaml
+++ b/util/dockerfiles/docker-compose.yaml
@@ -32,11 +32,6 @@ services:
             context: ubuntu-22.04_all-dependencies
             dockerfile: Dockerfile
         image: ghcr.io/gem5/ubuntu-22.04_all-dependencies:latest
-    ubuntu-22.04_min-dependencies:
-        build:
-            context: ubuntu-22.04_min-dependencies
-            dockerfile: Dockerfile
-        image: ghcr.io/gem5/ubuntu-22.04_min-dependencies:latest
     ubuntu-24.04_all-dependencies:
         build:
             context: ubuntu-24.04_all-dependencies
diff --git a/util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
deleted file mode 100644
index 690959da91..0000000000
--- a/util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (c) 2022 The Regents of the University of California
-# All Rights Reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met: redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer;
-# redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution;
-# neither the name of the copyright holders nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-FROM --platform=${BUILDPLATFORM} ubuntu:22.04
-
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt -y update && apt -y upgrade && \
-    apt -y install build-essential m4 scons python3-dev