git.delta.rocks / unique-network / refs/commits / e8717651bb50

difftreelog

add env variable into generation step

Alexander Aksenov2022-09-16parent: #3445c72.patch.diff
in: master

2 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -1,19 +1,17 @@
 FROM ubuntu:20.04
 
+ARG RUST_TOOLCHAIN=
+ARG FEATURE=
+
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
+ENV FEATURE=$FEATURE
+ENV CARGO_HOME="/cargo-home"
+ENV PATH="/cargo-home/bin:$PATH"
 
 RUN apt-get update && apt-get install -y git curl libssl-dev llvm pkg-config libclang-dev clang git make cmake
-
-ENV CARGO_HOME="/cargo-home"
-ENV PATH="/cargo-home/bin:$PATH"
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
-
-ARG RUST_TOOLCHAIN=
-ARG FEATURE=
-
-ENV FEATURE=$FEATURE
 
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
modified.docker/docker-compose.tmp-dev.j2diffbeforeafterboth
before · .docker/docker-compose.tmp-dev.j2
1version: "3.5"23services:4  node-dev:5    build:6      args:7        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"8        - "FEATURE={{ FEATURE }}"9      context: ../10      dockerfile: .docker/Dockerfile-chain-dev11    expose:12      - 994413      - 993314    ports:15      - 127.0.0.1:9944:994416      - 127.0.0.1:9933:993317    logging:18      options:19        max-size: "1m"20        max-file: "3"21    command: cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
after · .docker/docker-compose.tmp-dev.j2
1version: "3.5"23services:4  node-dev:5    build:6      args:7        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"8        - "FEATURE={{ FEATURE }}"9      context: ../10      dockerfile: .docker/Dockerfile-chain-dev11    environment:12      - FEATURE={{ FEATURE }}13    expose:14      - 994415      - 993316    ports:17      - 127.0.0.1:9944:994418      - 127.0.0.1:9933:993319    logging:20      options:21        max-size: "1m"22        max-file: "3"23    command: cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external