From 33bff2e4145f290bcaf829ac5df34f71d28d5b39 Mon Sep 17 00:00:00 2001
From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 29 May 2022 09:19:53 +0200
Subject: [PATCH] test: Add Ubuntu 22.04 Dockerfile

---
 dockerfiles/ubuntu-22.04/Dockerfile | 26 ++++++++++++++++++++++++++
 misc/test-all-systems               |  6 ++++++
 2 files changed, 32 insertions(+)
 create mode 100644 dockerfiles/ubuntu-22.04/Dockerfile

diff --git a/dockerfiles/ubuntu-22.04/Dockerfile b/dockerfiles/ubuntu-22.04/Dockerfile
new file mode 100644
index 000000000..1c6d56143
--- /dev/null
+++ b/dockerfiles/ubuntu-22.04/Dockerfile
@@ -0,0 +1,26 @@
+FROM ubuntu:22.04
+
+# Non-interactive: do not set up timezone settings.
+RUN apt-get update \
+ && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
+        asciidoctor \
+        bash \
+        build-essential \
+        ccache \
+        clang \
+        cmake \
+        docbook-xml \
+        docbook-xsl \
+        elfutils \
+        gcc-multilib \
+        gcc-12 \
+        g++-12 \
+        libhiredis-dev \
+        libzstd-dev \
+        python3 \
+        redis-server \
+        redis-tools \
+ && rm -rf /var/lib/apt/lists/*
+
+# Redirect all compilers to ccache.
+RUN for t in gcc g++ cc c++ clang clang++; do ln -vs /usr/bin/ccache /usr/local/bin/$t; done
diff --git a/misc/test-all-systems b/misc/test-all-systems
index e55123460..0635e8538 100755
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -29,6 +29,12 @@ build ubuntu-18.04 clang clang++ clang
 build ubuntu-20.04 gcc   g++     gcc
 build ubuntu-20.04 clang clang++ clang
 
+build ubuntu-22.04 gcc   g++     gcc
+build ubuntu-22.04 clang clang++ clang
+
+build ubuntu-22.04 gcc-12 g++-12  gcc
+build ubuntu-22.04 clang  clang++ clang
+
 build centos-7     gcc   g++     gcc     -DHIREDIS_FROM_INTERNET=ON
 build centos-7     gcc   g++     clang   -DHIREDIS_FROM_INTERNET=ON
 
-- 
2.47.3