Docker: parametrize Rust container to build with

nginx · Dec 31, 2024 · b66842b · b66842b
1 parent d76306a
commit b66842b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile
@@ -13,6 +13,9 @@ MODULES_SLIM ?= python
 
 VARIANT ?= bookworm
 
+VERSION_RUST ?= 1.83.0
+CONTAINER_RUST ?= rust:$(VERSION_RUST)-$(VARIANT)
+
 VERSIONS_minimal ?=
 CONTAINER_minimal ?= debian:$(VARIANT)-slim
 CONFIGURE_minimal ?=
@@ -141,6 +144,7 @@ Dockerfile.%: ../../version template.Dockerfile
 			-e 's,@@COPY_STEP@@,$(COPY_STEP_$(call modname, $*)),g' \
 			-e 's,@@PATCHLEVEL@@,$(PATCHLEVEL),g' \
 			-e 's,@@CONTAINER@@,$(CONTAINER_$*),g' \
+			-e 's,@@CONTAINER_RUST@@,$(CONTAINER_RUST),g' \
 			-e 's,@@CONFIGURE@@,$(CONFIGURE_$(call modname, $*)),g' \
 			-e 's,@@INSTALL@@,$(INSTALL_$(call modname, $*)),g' \
 			-e 's,@@RUN@@,$(RUN_$(call modname, $*)),g' \

diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.83.0-bookworm as rust-build
+FROM @@CONTAINER_RUST@@ as rust-build
 
 FROM @@CONTAINER@@