From 4d7e2c7983a569f1d5e456982b57caacc4844565 Mon Sep 17 00:00:00 2001
From: Sergey Nuyanzin <snuyanzin@gmail.com>
Date: Fri, 11 Sep 2026 13:58:53 +0200
Subject: [PATCH] [FLINK-40634][ci] Reuse mirror list to prepare faster image

---
 .../test-scripts/common_docker.sh             | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/flink-end-to-end-tests/test-scripts/common_docker.sh b/flink-end-to-end-tests/test-scripts/common_docker.sh
index 0415fc434742e..6ecd17416b79e 100644
--- a/flink-end-to-end-tests/test-scripts/common_docker.sh
+++ b/flink-end-to-end-tests/test-scripts/common_docker.sh
@@ -32,6 +32,29 @@ function containers_health_check() {
   done
 }
 
+# builds a base image once per job that routes the in-container apt through the same mirror list the host CI step uses
+function prepare_fast_base_image() {
+    local dockerfile="$1"
+    local base_tag="flink-e2e-base:local"
+    local mirror_list="${END_TO_END_DIR}/../tools/ci/ubuntu-mirror-list.txt"
+    [[ -f "$mirror_list" ]] || return 0
+    if ! docker image inspect "$base_tag" >/dev/null 2>&1; then
+        local upstream_from ctx
+        upstream_from=$(awk '/^FROM /{print $2; exit}' "$dockerfile")
+        [[ -z "$upstream_from" ]] && return 0
+        ctx=$(mktemp -d)
+        cp "$mirror_list" "${ctx}/mirrors.txt"
+        cat > "${ctx}/Dockerfile" <<EOF
+FROM ${upstream_from}
+COPY mirrors.txt /etc/apt/mirrors.txt
+RUN sed -i "s|http://archive.ubuntu.com/ubuntu/|mirror+file:/etc/apt/mirrors.txt|g" /etc/apt/sources.list.d/ubuntu.sources /etc/apt/sources.list 2>/dev/null || true
+EOF
+        docker build -t "$base_tag" --network=host "$ctx"
+        rm -rf "$ctx"
+    fi
+    sed -i.bak "0,/^FROM /s#^FROM .*#FROM ${base_tag}#" "$dockerfile" && rm -f "${dockerfile}.bak"
+}
+
 function build_image() {
     local image_name=${1:-flink-job}
     local default_file_server_address="localhost"
@@ -66,6 +89,8 @@ function build_image() {
     # eclipse-temurin:25+ images don't include wget; add it to the install step
     sed -i 's/apt-get -y install gpg/apt-get -y install gpg wget/' dev/${image_name}-ubuntu/Dockerfile
 
+    prepare_fast_base_image dev/${image_name}-ubuntu/Dockerfile
+
     echo "Building images"
     run_with_timeout 600 docker build --no-cache --network="host" -t ${image_name} dev/${image_name}-ubuntu
     local build_image_result=$?