Merge remote-tracking branch 'origin/develop' into gligneul/audit-m-01

.dockerignore

@@ -0,0 +1 @@
+./target

Cargo.toml

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Offchain Labs"]
-version = "0.5.5"
+version = "0.5.6"
 edition = "2021"
 homepage = "https://arbitrum.io"
 license = "MIT OR Apache-2.0"

Dockerfile

@@ -1,9 +1,15 @@
-FROM --platform=linux/amd64 rust:1.80 as builder
+ARG BUILD_PLATFORM=linux/amd64
+ARG RUST_VERSION=1.80
+ARG CARGO_STYLUS_VERSION
+
+FROM --platform=${BUILD_PLATFORM} rust:${RUST_VERSION} AS builder
 RUN apt-get update && apt-get install -y git
 RUN rustup target add x86_64-unknown-linux-gnu
-RUN git clone https://github.com/offchainlabs/cargo-stylus.git
+ARG CARGO_STYLUS_VERSION
+RUN test -n "$CARGO_STYLUS_VERSION"
+RUN git clone --branch v$CARGO_STYLUS_VERSION https://github.com/offchainlabs/cargo-stylus.git
 WORKDIR /cargo-stylus
-RUN git checkout v0.5.2
 RUN cargo build --release --manifest-path main/Cargo.toml
-FROM --platform=linux/amd64 rust:1.80
-COPY --from=builder /cargo-stylus/target/release/cargo-stylus /usr/local/bin/cargo-stylus
+
+FROM --platform=${BUILD_PLATFORM} rust:${RUST_VERSION} AS cargo-stylus-base
+COPY --from=builder /cargo-stylus/target/release/cargo-stylus /usr/local/bin/cargo-stylus

Makefile

@@ -1,3 +1,5 @@
+CARGO_STYLUS_VERSION := $(shell cargo pkgid --manifest-path main/Cargo.toml | cut -d '@' -f 2)
+
 .PHONY: build
 build:
 	cargo build
@@ -17,3 +19,7 @@ lint:
 .PHONY: install
 install: fmt lint
 	cargo install --path main
+
+.PHONY: docker
+docker:
+	docker build -t cargo-stylus-base:$(CARGO_STYLUS_VERSION) --build-arg CARGO_STYLUS_VERSION=$(CARGO_STYLUS_VERSION) .