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
58RUN git clone $REPO_URL -b $BRANCH .58RUN git clone $REPO_URL -b $BRANCH .
59RUN cargo build --features=$FEATURE --$PROFILE59RUN cargo build --features=$FEATURE --$PROFILE
6060
61RUN ls -la /unique_parachain
62RUN ls -la /unique_parachain/target/release/wbuild
6163
62# ===== BUILD POLKADOT =====64# ===== BUILD POLKADOT =====
63FROM rust-builder as builder-polkadot65FROM rust-builder as builder-polkadot
7678
77FROM ubuntu:20.0479FROM ubuntu:20.04
7880
81ARG RUNTIME=
82ENV RUNTIME $RUNTIME
83
79RUN apt-get -y update && \84RUN apt-get -y update && \
80 apt-get -y install curl git && \85 apt-get -y install curl git && \
81 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \86 curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
92 npm install --global yarn && \97 npm install --global yarn && \
93 yarn install98 yarn install
9499
100RUN echo "$RUNTIME"
101
95COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/102COPY --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/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.wasm
105
97COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/106COPY --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.wasm
108
98109
99CMD export NVM_DIR="$HOME/.nvm" && \110CMD export NVM_DIR="$HOME/.nvm" && \
100 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \111 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
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