From 069867d7404635d7556f881609eb171374c7be20 Mon Sep 17 00:00:00 2001 From: Adriano Di Luzio Date: Mon, 16 Dec 2024 12:14:59 +0100 Subject: [PATCH] Make it possible to build in `--release` mode in Docker CI and Makefile (#1134) --- .../actions/dockerfiles/Dockerfile.blocklist-client.debian | 4 +++- .github/actions/dockerfiles/Dockerfile.signer.debian | 4 +++- Makefile | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/actions/dockerfiles/Dockerfile.blocklist-client.debian b/.github/actions/dockerfiles/Dockerfile.blocklist-client.debian index 564e3921d..e2c7f6573 100644 --- a/.github/actions/dockerfiles/Dockerfile.blocklist-client.debian +++ b/.github/actions/dockerfiles/Dockerfile.blocklist-client.debian @@ -1,5 +1,7 @@ FROM rust:1.81.0-slim-bookworm AS build +ARG CARGO_BUILD_ARGS="--release" + # Install dependencies. RUN apt-get update RUN apt-get install -y --no-install-recommends \ @@ -20,7 +22,7 @@ RUN npm install -g @openapitools/openapi-generator-cli WORKDIR /code/sbtc COPY . . RUN make install && make build -RUN cargo build --bin blocklist-client +RUN cargo build --bin blocklist-client ${CARGO_BUILD_ARGS} # Create Docker image to run the signer. FROM debian:bookworm-slim AS blocklist-client diff --git a/.github/actions/dockerfiles/Dockerfile.signer.debian b/.github/actions/dockerfiles/Dockerfile.signer.debian index 3768c401c..601856433 100644 --- a/.github/actions/dockerfiles/Dockerfile.signer.debian +++ b/.github/actions/dockerfiles/Dockerfile.signer.debian @@ -1,5 +1,7 @@ FROM rust:1.81.0-slim-bookworm AS build +ARG CARGO_BUILD_ARGS="--release" + # Install dependencies. RUN apt-get update RUN apt-get install -y --no-install-recommends \ @@ -20,7 +22,7 @@ RUN npm install -g @openapitools/openapi-generator-cli WORKDIR /code/sbtc COPY . . RUN make install && make build -RUN cargo build --bin signer +RUN cargo build --bin signer ${CARGO_BUILD_ARGS} # Create Docker image to run the signer. FROM debian:bookworm-slim AS signer diff --git a/Makefile b/Makefile index 63d88e658..8f03c88d0 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ install: pnpm install build: $(AUTOGENERATED_BLOCKLIST_CLIENT_CLIENT) $(AUTOGENERATED_EMILY_CLIENT) - cargo build + cargo build ${CARGO_BUILD_ARGS} pnpm --recursive build # TODO(719): No need to do this once rustfmt 2.0.0 ships # Format generated sources: @@ -159,7 +159,7 @@ $(AUTOGENERATED_EMILY_CLIENT): $(INSTALL_TARGET) $(EMILY_OPENAPI_SPEC) # Build the OpenAPI specification. $(EMILY_OPENAPI_SPEC): $(INSTALL_TARGET) $(EMILY_HANDLER_SOURCE_FILES) - cargo build --package $(EMILY_OPENAPI_SPEC_PROJECT_NAME) + cargo build --package $(EMILY_OPENAPI_SPEC_PROJECT_NAME) ${CARGO_BUILD_ARGS} cargo fmt -p "$(EMILY_OPENAPI_SPEC_PROJECT_NAME)" # Devenv @@ -194,7 +194,7 @@ $(AUTOGENERATED_BLOCKLIST_CLIENT_CLIENT): $(BLOCKLIST_OPENAPI_SPEC) # Generate the OpenAPI spec for Blocklist Client BLOCKLIST_OPENAPI_SPEC_SOURCE_FILES := $(filter-out $(BLOCKLIST_OPENAPI_SPEC), $(wildcard $(subst dir, $(BLOCKLIST_OPENAPI_PATH), $(THREE_DIRS_DEEP)))) $(BLOCKLIST_OPENAPI_SPEC): $(INSTALL_TARGET) $(BLOCKLIST_OPENAPI_SPEC_SOURCE_FILES) - cargo build --package blocklist-openapi-gen + cargo build --package blocklist-openapi-gen ${CARGO_BUILD_ARGS} cargo fmt -p blocklist-openapi-gen # Signer