diff --git a/util/dockerfiles/docker-bake.hcl b/util/dockerfiles/docker-bake.hcl index 7cd05ce211..9b999124b6 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"] + 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"] } group "clang-compilers" { @@ -119,6 +119,13 @@ target "ubuntu-20-04_all-dependencies" { tags = ["${IMAGE_URI}/ubuntu-20.04_all-dependencies:${TAG}"] } +target "ubuntu-24-04_min-dependencies" { + inherits = ["common"] + dockerfile = "Dockerfile" + context = "ubuntu-24.04_min-dependencies" + tags = ["${IMAGE_URI}/ubuntu-24.04_min-dependencies:${TAG}"] +} + target "ubuntu-22-04_min-dependencies" { inherits = ["common"] dockerfile = "Dockerfile" diff --git a/util/dockerfiles/docker-compose.yaml b/util/dockerfiles/docker-compose.yaml index 29b1a4b778..b3c39cbd31 100644 --- a/util/dockerfiles/docker-compose.yaml +++ b/util/dockerfiles/docker-compose.yaml @@ -42,6 +42,11 @@ services: context: ubuntu-24.04_all-dependencies dockerfile: Dockerfile image: ghcr.io/gem5/ubuntu-24.04_all-dependencies:latest + ubuntu-24.04_min-dependencies: + build: + context: ubuntu-24.04_min-dependencies + dockerfile: Dockerfile + image: ghcr.io/gem5/ubuntu-24.04_min-dependencies:latest gcc-8: build: context: ubuntu-20.04_gcc-version diff --git a/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile new file mode 100644 index 0000000000..cdac54a791 --- /dev/null +++ b/util/dockerfiles/ubuntu-24.04_min-dependencies/Dockerfile @@ -0,0 +1,31 @@ +# Copyright (c) 2024 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:24.04 + +ENV DEBIAN_FRONTEND=noninteractive +RUN apt -y update && apt -y upgrade && \ + apt -y install build-essential m4 scons python3-dev