git.delta.rocks / unique-network / refs/commits / 04959868b343

difftreelog

Update due to found polkadot-launch requirements for upgrade.

Alexander Aksenov2022-08-10parent: #0098859.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 --test-upgrade103
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 --$PROFILE6061RUN ls -la /unique_parachain62RUN ls -la /unique_parachain/target/release/wbuild6364# ===== BUILD POLKADOT =====65FROM rust-builder as builder-polkadot6667ARG POLKADOT_BUILD_BRANCH=68ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6970RUN mkdir /unique_parachain71WORKDIR /unique_parachain7273RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \74    cd polkadot && \75    cargo build --release7677# ===== RUN ======7879FROM ubuntu:20.048081ARG RUNTIME=82ENV RUNTIME $RUNTIME8384RUN apt-get -y update && \85      apt-get -y install curl git && \86      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \87      export NVM_DIR="$HOME/.nvm" && \88      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \89      nvm install v16.16.0 && \90      nvm use v16.16.09192RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing9394RUN export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    npm install --global yarn && \98    yarn install99100RUN echo "$RUNTIME"101102COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/103COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/104COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm105106COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/107COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm108				      109110CMD export NVM_DIR="$HOME/.nvm" && \111    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \112    cd /polkadot-launch && \113    yarn start launch-config.json --test-upgrade114
modified.docker/docker-compose.tmp-forkless.j2diffbeforeafterboth
--- a/.docker/docker-compose.tmp-forkless.j2
+++ b/.docker/docker-compose.tmp-forkless.j2
@@ -8,6 +8,7 @@
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
+        - "RUNTIME={{ RUNTIME }}"
         - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
         - "MAINNET_TAG={{ MAINNET_TAG }}"
         - "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
modified.docker/launch-config.j2diffbeforeafterboth
--- a/.docker/launch-config.j2
+++ b/.docker/launch-config.j2
@@ -86,9 +86,9 @@
     },
       "parachains": [
         {
-            "bin": "../unique-chain/current/release/unique-collator",
-            "upgradeBin": "../unique-chain/target/release/unique-collator",
-            "upgradeWasm": "../unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
+            "bin": "/unique-chain/current/release/unique-collator",
+            "upgradeBin": "/unique-chain/target/release/unique-collator",
+            "upgradeWasm": "/unique-chain/target/release/wbuild/{{ FEATURE }}/{{ RUNTIME }}_runtime.compact.compressed.wasm",
             "id": "1000",
             "balance": "1000000000000000000000000",
             "nodes": [
modified.github/workflows/forkless-update-nodata.ymldiffbeforeafterboth
--- a/.github/workflows/forkless-update-nodata.yml
+++ b/.github/workflows/forkless-update-nodata.yml
@@ -90,6 +90,7 @@
             MAINNET_TAG=${{ matrix.mainnet_tag }}
             MAINNET_BRANCH=${{ matrix.mainnet_branch }}
             FEATURE=${{ matrix.features }}
+            RUNTIME=${{ matrix.runtime }}
             BRANCH=${{ github.head_ref }}
 
       - name: Show build configuration