From c9cbaf0de1d668b9bb236368c44f386f4a8ef166 Mon Sep 17 00:00:00 2001
From: Filip Filmar <filmil@gmail.com>
Date: Thu, 30 Oct 2025 06:47:16 +0000
Subject: [PATCH] feat: update the docker buildenv

- Updated rust version to 1.90.x
- Updated bindgen version to 0.72.x
- Added buildenvs for ICU 76 and 77 (we skipped 75, sigh)
---
 build/Dockerfile.buildenv        |  4 ++--
 build/Dockerfile.testenv         |  2 +-
 build/Dockerfile.testenv.current |  2 +-
 build/Makefile                   | 24 +++++++++++++++++++-----
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/build/Dockerfile.buildenv b/build/Dockerfile.buildenv
index 149727e..a88adca 100644
--- a/build/Dockerfile.buildenv
+++ b/build/Dockerfile.buildenv
@@ -1,8 +1,8 @@
 # rust_icu_buildenv.
-ARG RUST_VERSION=1.82.0
+ARG RUST_VERSION=1.90.0
 FROM rust:$RUST_VERSION AS buildenv
 
-ARG BINDGEN_CLI_VERSION=0.69.5
+ARG BINDGEN_CLI_VERSION=0.72.1
 
 RUN mkdir -p /src
 
diff --git a/build/Dockerfile.testenv b/build/Dockerfile.testenv
index 60d4f2a..6020116 100644
--- a/build/Dockerfile.testenv
+++ b/build/Dockerfile.testenv
@@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_$ICU_VERSION_TAG:$VERSION AS buildenv
 ARG DOCKER_REPO
 ARG VERSION
 ARG ICU_VERSION_TAG
-ARG BINDGEN_CLI_VERSION=0.69.5
+ARG BINDGEN_CLI_VERSION=0.72.1
 
 # Mount the rust_icu source top level directory here.
 ENV RUST_ICU_SOURCE_DIR=/src/rust_icu
diff --git a/build/Dockerfile.testenv.current b/build/Dockerfile.testenv.current
index 2cd914f..209e10d 100644
--- a/build/Dockerfile.testenv.current
+++ b/build/Dockerfile.testenv.current
@@ -7,7 +7,7 @@ FROM $DOCKER_REPO/rust_icu_buildenv:$VERSION AS buildenv
 ARG DOCKER_REPO
 ARG VERSION
 ARG ICU_VERSION_TAG
-ARG BINDGEN_CLI_VERSION=0.69.5
+ARG BINDGEN_CLI_VERSION=0.72.1
 
 ENV CARGO_BUILD_DIR=/build/cargo
 RUN mkdir -p $CARGO_BUILD_DIR
diff --git a/build/Makefile b/build/Makefile
index fc781dd..875b34d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -22,6 +22,8 @@ DOCKER_REPO ?= filipfilmar
 all: \
 	push-buildenv.stamp \
 	latest.stamp \
+	v77.stamp \
+	v76.stamp \
 	v74.stamp \
 	v73.stamp \
 	v72.stamp \
@@ -45,7 +47,9 @@ build-%.stamp: Dockerfile.%
 	docker build \
 			--build-arg DOCKER_REPO=${DOCKER_REPO} \
 			--build-arg VERSION=${VERSION} \
-			-f $< -t rust_icu_$*:${VERSION} .
+			-f $< \
+			-t rust_icu_$*:${VERSION} \
+			.
 	touch $@
 
 build-maint-%.stamp: Dockerfile.maint Dockerfile.buildenv
@@ -53,7 +57,9 @@ build-maint-%.stamp: Dockerfile.maint Dockerfile.buildenv
 			--build-arg DOCKER_REPO=${DOCKER_REPO} \
 			--build-arg VERSION=${VERSION} \
 			--build-arg ICU_VERSION_TAG=maint/maint-$* \
-			-f $< -t rust_icu_maint-$*:${VERSION} .
+			-f $< \
+			-t rust_icu_maint-$*:${VERSION} \
+			.
 	touch $@
 
 push-current.stamp: tag-current.stamp
@@ -71,7 +77,9 @@ build-current.stamp: Dockerfile.testenv.current \
 			--build-arg DOCKER_REPO=${DOCKER_REPO} \
 			--build-arg VERSION=${VERSION} \
 			--build-arg ICU_VERSION_TAG=maint-74 \
-			-f $< -t rust_icu_testenv-current:${VERSION} .
+			-f $< \
+			-t rust_icu_testenv-current:${VERSION} \
+			.
 	touch $@
 
 build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
@@ -80,7 +88,9 @@ build-testenv-%.stamp: Dockerfile.testenv Dockerfile.buildenv \
 			--build-arg DOCKER_REPO=${DOCKER_REPO} \
 			--build-arg VERSION=${VERSION} \
 			--build-arg ICU_VERSION_TAG=maint-$* \
-			-f $< -t rust_icu_testenv-$*:${VERSION} .
+			-f $< \
+			-t rust_icu_testenv-$*:${VERSION} \
+			.
 	touch $@
 
 tag-%.stamp: build-%.stamp
@@ -98,6 +108,10 @@ latest.stamp: push-buildenv.stamp v74.stamp
 # files to be preserved, but it seems that only explicitly named files can be
 # preserved. I.e. %.stamp doesn't work.
 .PRECIOUS: \
+	push-maint-77.stamp push-testenv-77.stamp \
+	build-testenv-77.stamp tag-testenv-77.stamp \
+	push-maint-76.stamp push-testenv-76.stamp \
+	build-testenv-76.stamp tag-testenv-76.stamp \
 	push-maint-74.stamp push-testenv-74.stamp \
 	build-testenv-74.stamp tag-testenv-74.stamp \
 	push-maint-73.stamp push-testenv-73.stamp \
@@ -118,7 +132,7 @@ v%.stamp: push-maint-%.stamp push-testenv-%.stamp
 # changes, and an unofficial tag.  This target should not push.
 test: Makefile \
 	build-buildenv.stamp tag-buildenv.stamp \
-	build-maint-74.stamp tag-maint-74.stamp \
+	build-maint-77.stamp tag-maint-77.stamp \
 	build-current.stamp tag-current.stamp
 .PHONY: test