chore: update Rust to 1.80.1

hseeberger · Aug 11, 2024 · 5470fdb · 5470fdb
1 parent de7e001
commit 5470fdb
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 39 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/hello-tracing-backend/Dockerfile b/hello-tracing-backend/Dockerfile
@@ -1,7 +1,8 @@
 # ---------- BUILD STAGE ---------- #
 
 # Keep in sync with rust-toolchain.toml to omit downloading/installing!
-FROM rust:1.80.0-bookworm AS build_stage
+ARG RUST_VERSION
+FROM rust:$RUST_VERSION-bookworm AS build_stage
 
 ARG PROFILE=release
 

diff --git a/hello-tracing-gateway/Dockerfile b/hello-tracing-gateway/Dockerfile
@@ -1,7 +1,8 @@
 # ---------- BUILD STAGE ---------- #
 
 # Keep in sync with rust-toolchain.toml to omit downloading/installing!
-FROM rust:1.80.0-bookworm AS build_stage
+ARG RUST_VERSION
+FROM rust:$RUST_VERSION-bookworm AS build_stage
 
 ARG PROFILE=release
 

diff --git a/justfile b/justfile
@@ -1,4 +1,5 @@
 set shell := ["bash", "-uc"]
+rust_version := `grep channel rust-toolchain.toml | sed -r 's/channel = "(.*)"/\1/'`
 
 check:
 	cargo check -p hello-tracing-common
@@ -41,10 +42,12 @@ run-backend port="8081":
 
 docker tag="latest":
 	docker build \
+		--build-arg "RUST_VERSION={{rust_version}}" \
 		-t hseeberger/hello-tracing-backend:{{tag}} \
 		-f hello-tracing-backend/Dockerfile \
 		.
 	docker build \
+		--build-arg "RUST_VERSION={{rust_version}}" \
 		-t hseeberger/hello-tracing-gateway:{{tag}} \
 		-f hello-tracing-gateway/Dockerfile \
 		.

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.80.0"
+channel = "1.80.1"