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

difftreelog

Merge pull request #7 from lzadjsf/core-ci-step-2

Alex2022-08-02parents: #b44aae5 #ba2b5f3.patch.diff
in: master
Ammended build command: added "--release" annotation.

3 files changed

modified.docker/Dockerfile-parachaindiffbeforeafterboth
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.1.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-116ARG POLKA_VERSION=release-v0.9.24789ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN10ENV POLKA_VERSION $POLKA_VERSION1112ENV CARGO_HOME="/cargo-home"13ENV PATH="/cargo-home/bin:$PATH"1415RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1617RUN apt-get update && \18    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \19    apt-get install -y cmake pkg-config libssl-dev git clang2021RUN rustup toolchain uninstall $(rustup toolchain list) && \22    rustup toolchain install $RUST_TOOLCHAIN && \23    rustup default $RUST_TOOLCHAIN && \24    rustup target list --installed && \25    rustup show26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2728####works inside repo folder###293031# ===== BUILD ======32FROM rust-builder as builder-unique3334RUN mkdir unique_parachain35WORKDIR /unique_parachain3637ARG FEATURE='--release'3839COPY . .40RUN cargo build $FEATURE41   # && \42   # cargo test4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647RUN mkdir unique_parachain48WORKDIR /unique_parachain4950RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \51    cd polkadot && \52    git tag -n && \53	cargo build --release5455# ===== RUN ======5657FROM phusion/baseimage:focal-1.1.05859RUN apt-get -y update && \60      apt-get -y upgrade && \61      apt-get -y install curl git && \62      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \63      export NVM_DIR="$HOME/.nvm" && \64      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \65      nvm install v15.5.0 && \66      nvm use v15.5.06768RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \69    cd /polkadot-launch && \70    git checkout feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /polkadot-launch && \75    npm install --global yarn && \76    yarn7778COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8081COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]828384EXPOSE 984485EXPOSE 994486EXPOSE 993387EXPOSE 983388EXPOSE 4033389EXPOSE 303339091CMD export NVM_DIR="$HOME/.nvm" && \92    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \93    cd /polkadot-launch && \94    yarn start launch-config.json
after · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM phusion/baseimage:focal-1.1.0 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-116ARG POLKA_VERSION=release-v0.9.24789ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN10ENV POLKA_VERSION $POLKA_VERSION1112ENV CARGO_HOME="/cargo-home"13ENV PATH="/cargo-home/bin:$PATH"1415RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1617RUN apt-get update && \18    apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \19    apt-get install -y cmake pkg-config libssl-dev git clang2021RUN rustup toolchain uninstall $(rustup toolchain list) && \22    rustup toolchain install $RUST_TOOLCHAIN && \23    rustup default $RUST_TOOLCHAIN && \24    rustup target list --installed && \25    rustup show26RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN2728####works inside repo folder###293031# ===== BUILD ======32FROM rust-builder as builder-unique3334RUN mkdir unique_parachain35WORKDIR /unique_parachain3637ARG FEATURE=' '3839COPY . .40RUN cargo build $FEATURE --release41   # && \42   # cargo test4344# ===== BUILD POLKADOT =====45FROM rust-builder as builder-polkadot4647RUN mkdir unique_parachain48WORKDIR /unique_parachain4950RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \51    cd polkadot && \52    git tag -n && \53	cargo build --release5455# ===== RUN ======5657FROM phusion/baseimage:focal-1.1.05859RUN apt-get -y update && \60      apt-get -y upgrade && \61      apt-get -y install curl git && \62      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \63      export NVM_DIR="$HOME/.nvm" && \64      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \65      nvm install v15.5.0 && \66      nvm use v15.5.06768RUN git clone https://github.com/UniqueNetwork/polkadot-launch.git && \69    cd /polkadot-launch && \70    git checkout feature/runtime-upgrade-testing7172RUN export NVM_DIR="$HOME/.nvm" && \73    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \74    cd /polkadot-launch && \75    npm install --global yarn && \76    yarn7778COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/79COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8081COPY ["./launch-config.json", "/polkadot-launch/launch-config.json"]828384EXPOSE 984485EXPOSE 994486EXPOSE 993387EXPOSE 983388EXPOSE 4033389EXPOSE 303339091CMD export NVM_DIR="$HOME/.nvm" && \92    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \93    cd /polkadot-launch && \94    yarn start launch-config.json
modified.docker/docker-compose-dev.yamldiffbeforeafterboth
--- a/.docker/docker-compose-dev.yaml
+++ b/.docker/docker-compose-dev.yaml
@@ -3,8 +3,8 @@
 services:
   node-o:
     build:
-      context: .
-      dockerfile: Dockerfile-chain-dev
+      context: ../
+      dockerfile: .docker/Dockerfile-chain-dev
     image: node-o
     container_name: node-o
     expose:
modified.docker/docker-compose.tmp.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -1,12 +1,10 @@
 version: "3.5"
 
 services:
-  blockchain_nodes:
+  node-o:
     build:
       args:
         - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
-
-    command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external