Rework the makefiles.

docker/organic_development/Dockerfile

@@ -2,10 +2,16 @@ FROM rustlang/rust:nightly-alpine3.19 AS builder
 
 RUN apk add --no-cache musl-dev
 RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
-RUN rustup component add rustfmt
-RUN rustup component add clippy
 RUN rustup component add rustc-codegen-cranelift
 
+FROM builder AS format
+
+RUN rustup component add rustfmt
+
+FROM builder AS clippy
+
+RUN rustup component add clippy
+
 FROM builder AS wasm
 
 RUN rustup target add wasm32-unknown-unknown

docker/organic_development/Makefile

@@ -10,8 +10,11 @@ ifeq ($(origin .RECIPEPREFIX), undefined)
 endif
 .RECIPEPREFIX = >
 
-IMAGE_NAME:=organic-development
-TARGET :=
+TARGET := builder
+IMAGE_NAME := organic-development
+ifneq ($(TARGET),builder)
+  IMAGE_NAME := $(IMAGE_NAME)-$(TARGET)
+endif
 
 .PHONY: help
 help: