Skip to content

[FLINK-40634][ci] Reuse mirror list to prepare faster image #29160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
snuyanzin wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −0
Draft

[FLINK-40634][ci] Reuse mirror list to prepare faster image #29160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions flink-end-to-end-tests/test-scripts/common_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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=$?
Expand Down