diff --git a/Dockerfile b/Dockerfile index c64f906b8..ace5ce348 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,19 +6,21 @@ FROM paritytech/ci-unified:bullseye-1.70.0 as builder WORKDIR /build ARG FEATURES=default +ARG BINARY=kilt-parachain COPY . . -RUN cargo build --locked --release --features $FEATURES +RUN cargo build --locked --release --features $FEATURES -p $BINARY # ===== SECOND STAGE ====== FROM docker.io/library/ubuntu:20.04 -LABEL description="This is the 2nd stage: a very small image where we copy the kilt-parachain binary." -ARG NODE_TYPE=kilt-parachain +ARG BINARY=kilt-parachain -COPY --from=builder /build/target/release/$NODE_TYPE /usr/local/bin/node-executable +LABEL description="This is the 2nd stage: a very small image where we copy the ${BINARY} binary." + +COPY --from=builder /build/target/release/$BINARY /usr/local/bin/node-executable RUN useradd -m -u 1000 -U -s /bin/sh -d /node node && \ mkdir -p /node/.local/share/node && \ diff --git a/dip-template/nodes/dip-consumer/Cargo.toml b/dip-template/nodes/dip-consumer/Cargo.toml index b48e55d0d..2937dee83 100644 --- a/dip-template/nodes/dip-consumer/Cargo.toml +++ b/dip-template/nodes/dip-consumer/Cargo.toml @@ -68,3 +68,6 @@ cumulus-relay-chain-interface.workspace = true [build-dependencies] substrate-build-script-utils.workspace = true + +[features] +default = [] diff --git a/dip-template/nodes/dip-consumer/src/command.rs b/dip-template/nodes/dip-consumer/src/command.rs index e56083950..7d5809ced 100644 --- a/dip-template/nodes/dip-consumer/src/command.rs +++ b/dip-template/nodes/dip-consumer/src/command.rs @@ -33,15 +33,17 @@ use sc_telemetry::TelemetryEndpoints; use sp_runtime::traits::AccountIdConversion; use crate::{ - chain_spec::{development_config, Extensions}, + chain_spec::{development_config, ChainSpec as ConsumerChainSpec, Extensions}, cli::{Cli, RelayChainCli, Subcommand}, service::{new_partial, start_parachain_node}, }; fn load_spec(id: &str) -> std::result::Result, String> { match id { - "dev" => Ok(Box::new(development_config())), - _ => Err("Unrecognized spec ID.".into()), + "dev" | "" => Ok(Box::new(development_config())), + path => Ok(Box::new(ConsumerChainSpec::from_json_file(std::path::PathBuf::from( + path, + ))?)), } } diff --git a/dip-template/nodes/dip-provider/Cargo.toml b/dip-template/nodes/dip-provider/Cargo.toml index 0bc866ddd..b9d134dbc 100644 --- a/dip-template/nodes/dip-provider/Cargo.toml +++ b/dip-template/nodes/dip-provider/Cargo.toml @@ -68,3 +68,6 @@ cumulus-relay-chain-interface.workspace = true [build-dependencies] substrate-build-script-utils.workspace = true + +[features] +default = [] diff --git a/dip-template/nodes/dip-provider/src/command.rs b/dip-template/nodes/dip-provider/src/command.rs index 6e508956e..ca4f66d47 100644 --- a/dip-template/nodes/dip-provider/src/command.rs +++ b/dip-template/nodes/dip-provider/src/command.rs @@ -33,15 +33,17 @@ use sc_telemetry::TelemetryEndpoints; use sp_runtime::traits::AccountIdConversion; use crate::{ - chain_spec::{development_config, Extensions}, + chain_spec::{development_config, ChainSpec as ProviderChainSpec, Extensions}, cli::{Cli, RelayChainCli, Subcommand}, service::{new_partial, start_parachain_node}, }; fn load_spec(id: &str) -> std::result::Result, String> { match id { - "dev" => Ok(Box::new(development_config())), - _ => Err("Unrecognized spec ID.".into()), + "dev" | "" => Ok(Box::new(development_config())), + path => Ok(Box::new(ProviderChainSpec::from_json_file(std::path::PathBuf::from( + path, + ))?)), } }