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

difftreelog

Location to generated launch-config-forkless.json has been amended in dockerfile.

Alexander Aksenov2022-08-10parent: #9961e3b.patch.diff
in: master

4 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN262728#RUN mkdir /unique_parachain29#WORKDIR /unique_parachain303132# ===== BUILD current version ======33FROM rust-builder as builder-unique-current3435ARG PROFILE=release36ARG FEATURE=37ARG MAINNET_BRANCH=38ARG REPO_URL=3940RUN mkdir /unique_parachain41WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH .44RUN cargo build --features=$FEATURE --$PROFILE454647# ===== BUILD target version ======48FROM rust-builder as builder-unique-target4950ARG PROFILE=release51ARG FEATURE=52ARG BRANCH=53ARG REPO_URL=5455RUN mkdir /unique_parachain56WORKDIR /unique_parachain5758RUN git clone $REPO_URL -b $BRANCH .59RUN cargo build --features=$FEATURE --$PROFILE606162# ===== BUILD POLKADOT =====63FROM rust-builder as builder-polkadot6465ARG POLKADOT_BUILD_BRANCH=66ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6768RUN mkdir /unique_parachain69WORKDIR /unique_parachain7071RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \72    cd polkadot && \73    cargo build --release7475# ===== RUN ======7677FROM ubuntu:20.047879RUN apt-get -y update && \80      apt-get -y install curl git && \81      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \82      export NVM_DIR="$HOME/.nvm" && \83      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \84      nvm install v16.16.0 && \85      nvm use v16.16.08687RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing8889RUN export NVM_DIR="$HOME/.nvm" && \90    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \91    cd /polkadot-launch && \92    npm install --global yarn && \93    yarn install9495COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/96COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/97COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/9899CMD export NVM_DIR="$HOME/.nvm" && \100    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \101    cd /polkadot-launch && \102    yarn start launch-config.json
after · .docker/Dockerfile-parachain-upgrade
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN262728#RUN mkdir /unique_parachain29#WORKDIR /unique_parachain303132# ===== BUILD current version ======33FROM rust-builder as builder-unique-current3435ARG PROFILE=release36ARG FEATURE=37ARG MAINNET_BRANCH=38ARG REPO_URL=3940RUN mkdir /unique_parachain41WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH .44RUN cargo build --features=$FEATURE --$PROFILE454647# ===== BUILD target version ======48FROM rust-builder as builder-unique-target4950ARG PROFILE=release51ARG FEATURE=52ARG BRANCH=53ARG REPO_URL=5455RUN mkdir /unique_parachain56WORKDIR /unique_parachain5758RUN git clone $REPO_URL -b $BRANCH .59RUN cargo build --features=$FEATURE --$PROFILE606162# ===== BUILD POLKADOT =====63FROM rust-builder as builder-polkadot6465ARG POLKADOT_BUILD_BRANCH=66ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6768RUN mkdir /unique_parachain69WORKDIR /unique_parachain7071RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \72    cd polkadot && \73    cargo build --release7475# ===== RUN ======7677FROM ubuntu:20.047879RUN apt-get -y update && \80      apt-get -y install curl git && \81      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \82      export NVM_DIR="$HOME/.nvm" && \83      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \84      nvm install v16.16.0 && \85      nvm use v16.16.08687RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing8889RUN export NVM_DIR="$HOME/.nvm" && \90    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \91    cd /polkadot-launch && \92    npm install --global yarn && \93    yarn install9495COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/96COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/97COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/9899CMD export NVM_DIR="$HOME/.nvm" && \100    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \101    cd /polkadot-launch && \102    yarn start launch-config.json --test-upgrade103
modified.docker/docker-compose-forkless.yamldiffbeforeafterboth
--- a/.docker/docker-compose-forkless.yaml
+++ b/.docker/docker-compose-forkless.yaml
@@ -8,7 +8,10 @@
     image: node-parachain
     container_name: node-parachain
     volumes:
-      - .docker/launch-config-forkless.json:/polkadot-launch/launch-config.json
+       - type: bind
+         source: ./launch-config-forkless.json
+         target: /polkadot-launch/launch-config.json
+         read_only: true
     expose:
       - 9944
       - 9933
modified.docker/launch-config.j2diffbeforeafterboth
--- a/.docker/launch-config.j2
+++ b/.docker/launch-config.j2
@@ -1,4 +1,87 @@
 {
+      "relaychain": {
+        "bin": "../alts/polkadot/target/release/polkadot",
+        "chain": "westend-local",
+        "nodes": [
+            {
+                "name": "alice",
+                "wsPort": 9844,
+                "rpcPort": 9843,
+                "port": 30444,
+                "flags": [
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
+                ]
+            },
+            {
+                "name": "bob",
+                "wsPort": 9855,
+                "rpcPort": 9854,
+                "port": 30555,
+                "flags": [
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
+                ]
+            },
+            {
+                "name": "charlie",
+                "wsPort": 9866,
+                "rpcPort": 9865,
+                "port": 30666,
+                "flags": [
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
+                ]
+            },
+            {
+                "name": "dave",
+                "wsPort": 9877,
+                "rpcPort": 9876,
+                "port": 30777,
+                "flags": [
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
+                ]
+            },
+            {
+                "name": "eve",
+                "wsPort": 9888,
+                "rpcPort": 9887,
+                "port": 30888,
+                "flags": [
+                    "-lparachain::candidate_validation=debug",
+                    "-lxcm=trace",
+                    "--rpc-cors=all",
+                    "--unsafe-rpc-external",
+                    "--unsafe-ws-external"
+                ]
+            }
+        ],
+        "genesis": {
+            "runtime": {
+                "runtime_genesis_config": {
+                    "parachainsConfiguration": {
+                        "config": {
+                            "validation_upgrade_frequency": 1,
+                            "validation_upgrade_delay": 1
+                        }
+                    }
+                }
+            }
+        }
+    },
       "parachains": [
         {
             "bin": "../unique-chain/current/release/unique-collator",
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -112,7 +112,7 @@
 
 
       - name: Build the stack
-        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build --force-recreate --remove-orphans
+        run: docker-compose -f ".docker/docker-compose-forkless.yaml" -f ".docker/docker-compose.${{ matrix.network }}.yml" up -d --build
 
 
 #      - name: Test Report