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
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -58,6 +58,8 @@
 RUN git clone $REPO_URL -b $BRANCH .
 RUN cargo build --features=$FEATURE --$PROFILE
 
+RUN ls -la /unique_parachain
+RUN ls -la /unique_parachain/target/release/wbuild
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
@@ -76,6 +78,9 @@
 
 FROM ubuntu:20.04
 
+ARG RUNTIME=
+ENV RUNTIME $RUNTIME
+
 RUN apt-get -y update && \
       apt-get -y install curl git && \
       curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
@@ -92,9 +97,15 @@
     npm install --global yarn && \
     yarn install
 
+RUN echo "$RUNTIME"
+
 COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
 COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --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
+
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
+COPY --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
+				      
 
 CMD export NVM_DIR="$HOME/.nvm" && \
     [ -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
82 with:82 with:
83 template: .docker/docker-compose.tmp-forkless.j283 template: .docker/docker-compose.tmp-forkless.j2
84 output_file: .docker/docker-compose.${{ matrix.network }}.yml84 output_file: .docker/docker-compose.${{ matrix.network }}.yml
85 variables: |85 variables: |
86 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git86 REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
87 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}87 RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
88 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}88 POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
89 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}89 POLKADOT_MAINNET_BRANCH=${{ env.POLKADOT_MAINNET_BRANCH }}
90 MAINNET_TAG=${{ matrix.mainnet_tag }}90 MAINNET_TAG=${{ matrix.mainnet_tag }}
91 MAINNET_BRANCH=${{ matrix.mainnet_branch }}91 MAINNET_BRANCH=${{ matrix.mainnet_branch }}
92 FEATURE=${{ matrix.features }}92 FEATURE=${{ matrix.features }}
93 BRANCH=${{ github.head_ref }}93 RUNTIME=${{ matrix.runtime }}
94 BRANCH=${{ github.head_ref }}
9495
95 - name: Show build configuration96 - name: Show build configuration
96 run: cat .docker/docker-compose.${{ matrix.network }}.yml97 run: cat .docker/docker-compose.${{ matrix.network }}.yml