From 1c5daab55dd84bca7149236e4b4fa009e5fd95ca Mon Sep 17 00:00:00 2001
From: Mizux Seiha <mizux.dev@gmail.com>
Date: Wed, 23 Apr 2025 18:37:26 +0200
Subject: [PATCH] ci: Fix few dockerfiles

---
 bazel/docker/fedora/Dockerfile        |  2 +-
 bazel/docker/ubuntu/Dockerfile        | 22 ++++++++++++----------
 cmake/docker/fedora/java.Dockerfile   |  2 +-
 cmake/docker/ubuntu/python.Dockerfile |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/bazel/docker/fedora/Dockerfile b/bazel/docker/fedora/Dockerfile
index efc3a08ef8..322071bb80 100644
--- a/bazel/docker/fedora/Dockerfile
+++ b/bazel/docker/fedora/Dockerfile
@@ -20,7 +20,7 @@ https://github.com/bazelbuild/bazelisk/releases/download/v1.23.0/bazelisk-linux-
 
 # Install Java
 RUN dnf -y update \
-&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
+&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
 && dnf clean all
 ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 
diff --git a/bazel/docker/ubuntu/Dockerfile b/bazel/docker/ubuntu/Dockerfile
index 268e79a94b..83fbe80f51 100644
--- a/bazel/docker/ubuntu/Dockerfile
+++ b/bazel/docker/ubuntu/Dockerfile
@@ -7,21 +7,23 @@ ENV TZ=Europe/Paris
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install system build dependencies
-RUN apt-get update -qq \
-&& apt-get install -yq git wget curl libssl-dev build-essential \
-&& apt-get install -yq python3-dev python3-pip python3-venv \
+RUN apt update -qq \
+&& apt install -yq git wget curl libssl-dev build-essential \
+&& apt install -yq python3-dev python3-pip python3-venv \
  python3-numpy python3-pandas \
-&& apt-get install -yq default-jdk \
-&& apt-get clean \
+&& apt install -yq default-jdk \
+&& apt clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install Bazel
-RUN curl https://bazel.build/bazel-release.pub.gpg | apt-key add -
+RUN apt install -y apt-transport-https curl gnupg \
+&& curl -fsSL https://bazel.build/bazel-release.pub.gpg | gpg --dearmor >bazel-archive-keyring.gpg \
+&& mv bazel-archive-keyring.gpg /usr/share/keyrings
 ARG TARGETARCH=amd64
-RUN echo "deb [arch=$TARGETARCH] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
-RUN apt-get update -qq \
-&& apt-get install -yq bazel \
-&& apt-get clean \
+RUN echo "deb [arch=$TARGETARCH signed-by=/usr/share/keyrings/bazel-archive-keyring.gpg] https://storage.googleapis.com/bazel-apt stable jdk1.8" | tee /etc/apt/sources.list.d/bazel.list
+RUN apt update -qq \
+&& apt install -yq bazel \
+&& apt clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 FROM env AS devel
diff --git a/cmake/docker/fedora/java.Dockerfile b/cmake/docker/fedora/java.Dockerfile
index 62ef7b3461..b5b1210bd5 100644
--- a/cmake/docker/fedora/java.Dockerfile
+++ b/cmake/docker/fedora/java.Dockerfile
@@ -1,7 +1,7 @@
 FROM ortools/cmake:fedora_swig AS env
 
 RUN dnf -y update \
-&& dnf -y install java-11-openjdk java-11-openjdk-devel maven \
+&& dnf -y install java-21-openjdk java-21-openjdk-devel maven \
 && dnf clean all
 ENV JAVA_HOME=/usr/lib/jvm/java-openjdk
 
diff --git a/cmake/docker/ubuntu/python.Dockerfile b/cmake/docker/ubuntu/python.Dockerfile
index 859e859c16..9130256e3d 100644
--- a/cmake/docker/ubuntu/python.Dockerfile
+++ b/cmake/docker/ubuntu/python.Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update -qq \
  python3-dev python3-pip \
  python3-setuptools python3-wheel \
  python3-venv python3-virtualenv \
- python3-numpy python3-pandas \
+ python3-numpy python3-pandas python3-typing-extensions \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 RUN python3 -m pip install --break-system-package \