util-docker,tests: Update supported/test OS to Ubuntu 22.04
We add a Ubuntu 22.04 min- and all-dependency docker images. We also
update the compiler tests to compile with Ubuntu 22.04.
The Ubuntu 20.04 min-dependency image has been removed. It is no
longer required.
Change-Id: Iaf7f7e8598907beb16e154c971f327927f707cb9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/64177
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
diff --git a/tests/compiler-tests.sh b/tests/compiler-tests.sh
index cd9f0bb..e01d9de 100755
--- a/tests/compiler-tests.sh
+++ b/tests/compiler-tests.sh
@@ -28,11 +28,12 @@
"clang-version-8"
"clang-version-7"
"clang-version-6.0"
- # The following checks our support for Ubuntu 18.04 and 20.04, for both our
- # "minimum dependencies" and "all dependencies" docker images.
+ # The following checks our support for Ubuntu 18.04, 20.04, and 22.04.
"ubuntu-18.04_all-dependencies"
"ubuntu-20.04_all-dependencies"
- "ubuntu-20.04_min-dependencies"
+ "ubuntu-22.04_all-dependencies"
+ # Here we test the minimum dependency scenario.
+ "ubuntu-22.04_min-dependencies"
)
# A subset of the above list: these images will build against every target,
diff --git a/util/dockerfiles/docker-compose.yaml b/util/dockerfiles/docker-compose.yaml
index da0f52a..a646e8f 100644
--- a/util/dockerfiles/docker-compose.yaml
+++ b/util/dockerfiles/docker-compose.yaml
@@ -31,11 +31,16 @@
context: ubuntu-20.04_all-dependencies
dockerfile: Dockerfile
image: gcr.io/gem5-test/ubuntu-20.04_all-dependencies
- ubuntu-20.04_min-dependencies:
+ ubuntu-22.04_all-dependencies:
build:
- context: ubuntu-20.04_min-dependencies
+ context: ubuntu-22.04_all-dependencies
dockerfile: Dockerfile
- image: gcr.io/gem5-test/ubuntu-20.04_min-dependencies
+ image: gcr.io/gem5-test/ubuntu-22.04_all-dependencies
+ ubuntu-22.04_min-dependencies:
+ build:
+ context: ubuntu-22.04_min-dependencies
+ dockerfile: Dockerfile
+ image: gcr.io/gem5-test/ubuntu-22.04_min-dependencies
gcc-7:
build:
context: ubuntu-18.04_gcc-version
diff --git a/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile
similarity index 79%
copy from util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
copy to util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile
index 4b65146..e5afc63 100644
--- a/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-22.04_all-dependencies/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 The Regents of the University of California
+# Copyright (c) 2022 The Regents of the University of California
# All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,13 @@
# (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 ubuntu:20.04
+FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update && apt -y upgrade && \
- apt -y install build-essential m4 scons python3-dev python-is-python3
+ apt -y install build-essential git m4 scons zlib1g zlib1g-dev \
+ libprotobuf-dev protobuf-compiler libprotoc-dev libgoogle-perftools-dev \
+ python3-dev doxygen libboost-all-dev libhdf5-serial-dev python3-pydot \
+ libpng-dev libelf-dev pkg-config pip python3-venv black
+
+RUN pip install mypy pre-commit
diff --git a/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile b/util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
similarity index 90%
rename from util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
rename to util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
index 4b65146..978e2c6 100644
--- a/util/dockerfiles/ubuntu-20.04_min-dependencies/Dockerfile
+++ b/util/dockerfiles/ubuntu-22.04_min-dependencies/Dockerfile
@@ -1,4 +1,4 @@
-# Copyright (c) 2020 The Regents of the University of California
+# Copyright (c) 2022 The Regents of the University of California
# All Rights Reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,8 @@
# (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 ubuntu:20.04
+FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt -y update && apt -y upgrade && \
- apt -y install build-essential m4 scons python3-dev python-is-python3
+ apt -y install build-essential m4 scons python3-dev
