From f391b4a17904dfe5d16f1fd86d2450a110190b70 Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Sun, 12 Oct 2025 05:33:06 +0200
Subject: [PATCH] docker: add back CMake for the images used in Cirrus

build_tools/check.sh would give more coverage (the translation
checks is the main difference) but it tests embed-data builds;
for now testing, traditionally installed builds is more important
(especially since I always test check.sh locally already). In future
we will probably make embedding mandatory and get rid of this schism.
---
 docker/alpine.Dockerfile            | 1 +
 docker/focal-arm64.Dockerfile       | 1 +
 docker/jammy-armv7-32bit.Dockerfile | 1 +
 docker/jammy.Dockerfile             | 1 +
 4 files changed, 4 insertions(+)

diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile
index 51ad9a541..fb27fbd97 100644
--- a/docker/alpine.Dockerfile
+++ b/docker/alpine.Dockerfile
@@ -6,6 +6,7 @@ ENV LC_ALL=C.UTF-8
 ENV PIP_ROOT_USER_ACTION=ignore
 
 RUN apk add --no-cache \
+    cmake ninja \
     bash \
     cargo \
     g++ \
diff --git a/docker/focal-arm64.Dockerfile b/docker/focal-arm64.Dockerfile
index 85e2c9433..698c8a529 100644
--- a/docker/focal-arm64.Dockerfile
+++ b/docker/focal-arm64.Dockerfile
@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get -y install --no-install-recommends \
+    cmake ninja-build \
     build-essential \
     ca-certificates \
     cargo \
diff --git a/docker/jammy-armv7-32bit.Dockerfile b/docker/jammy-armv7-32bit.Dockerfile
index 6c9455a0b..1e7a98d57 100644
--- a/docker/jammy-armv7-32bit.Dockerfile
+++ b/docker/jammy-armv7-32bit.Dockerfile
@@ -7,6 +7,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update \
   && apt-get -y install --no-install-recommends  \
+    cmake ninja-build \
     build-essential \
     ca-certificates \
     cargo \
diff --git a/docker/jammy.Dockerfile b/docker/jammy.Dockerfile
index c111fabe7..476a0d55c 100644
--- a/docker/jammy.Dockerfile
+++ b/docker/jammy.Dockerfile
@@ -6,6 +6,7 @@ ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
   && apt-get -y install --no-install-recommends  \
+    cmake ninja-build \
     build-essential \
     ca-certificates \
     cargo \