Skip to content

Commit b66842b

Browse files
committed
Docker: parametrize Rust container to build with
1 parent d76306a commit b66842b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pkg/docker/Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ MODULES_SLIM ?= python
1313

1414
VARIANT ?= bookworm
1515

16+
VERSION_RUST ?= 1.83.0
17+
CONTAINER_RUST ?= rust:$(VERSION_RUST)-$(VARIANT)
18+
1619
VERSIONS_minimal ?=
1720
CONTAINER_minimal ?= debian:$(VARIANT)-slim
1821
CONFIGURE_minimal ?=
@@ -141,6 +144,7 @@ Dockerfile.%: ../../version template.Dockerfile
141144
-e 's,@@COPY_STEP@@,$(COPY_STEP_$(call modname, $*)),g' \
142145
-e 's,@@PATCHLEVEL@@,$(PATCHLEVEL),g' \
143146
-e 's,@@CONTAINER@@,$(CONTAINER_$*),g' \
147+
-e 's,@@CONTAINER_RUST@@,$(CONTAINER_RUST),g' \
144148
-e 's,@@CONFIGURE@@,$(CONFIGURE_$(call modname, $*)),g' \
145149
-e 's,@@INSTALL@@,$(INSTALL_$(call modname, $*)),g' \
146150
-e 's,@@RUN@@,$(RUN_$(call modname, $*)),g' \

pkg/docker/template.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM rust:1.83.0-bookworm as rust-build
1+
FROM @@CONTAINER_RUST@@ as rust-build
22

33
FROM @@CONTAINER@@
44

0 commit comments

Comments
 (0)