Skip to content

Commit 3105d4f

Browse files
kozyrevdevkozyrevdev
authored
Merge pull request #813 from UniqueNetwork/release-v936040
Release v936040
2 parents 2f34937 + 3c2e49b commit 3105d4f

33 files changed

Lines changed: 337 additions & 291 deletions

‎.docker/Dockerfile-parachain-node-only‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ FROM ubuntu:20.04
6161

6262
ARG NETWORK
6363
ARG POLKADOT_LAUNCH_BRANCH
64+
ARG WASM_NAME
6465

6566
RUN apt-get -y update && \
6667
apt-get -y install curl git && \
@@ -82,7 +83,7 @@ RUN echo "$NETWORK"
8283

8384
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
8485
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
85-
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
86+
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm
8687

8788
COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
8889
COPY --from=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

‎.docker/Dockerfile-parachain-upgrade‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ FROM ubuntu:20.04
5959

6060
ARG NETWORK
6161
ARG POLKADOT_LAUNCH_BRANCH
62+
ARG WASM_NAME
6263

6364
RUN apt-get -y update && \
6465
apt-get -y install curl git && \
@@ -80,7 +81,7 @@ RUN echo "$NETWORK"
8081

8182
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
8283
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
83-
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
84+
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm
8485

8586
COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
8687
COPY --from=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

‎.docker/Dockerfile-parachain-upgrade-data‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ ARG NETWORK
6363
ARG REPLICA_FROM
6464
ENV REPLICA_FROM=${REPLICA_FROM}
6565
ARG POLKADOT_LAUNCH_BRANCH
66+
ARG WASM_NAME
6667

6768
RUN apt-get -y update && \
6869
apt-get -y install curl git && \
@@ -85,7 +86,7 @@ RUN echo "$REPLICA_FROM"
8586

8687
COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/
8788
COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/
88-
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$NETWORK"-runtime/"$NETWORK"_runtime.compact.compressed.wasm
89+
COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$WASM_NAME"-runtime/"$WASM_NAME"_runtime.compact.compressed.wasm
8990

9091
COPY --from=uniquenetwork/builder-chainql:latest /chainql/target/release/chainql /chainql/target/release/
9192

‎.docker/Dockerfile-try-runtime‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ FROM rust-builder as builder-unique
3535
ARG PROFILE=release
3636
ARG NETWORK
3737
ARG REPLICA_FROM
38+
ARG WASM_NAME
3839
ENV NETWORK $NETWORK
3940
ENV REPLICA_FROM $REPLICA_FROM
41+
ENV WASM_NAME $WASM_NAME
4042

4143
COPY . /unique_parachain
4244
WORKDIR /unique_parachain
@@ -46,4 +48,4 @@ RUN echo "Requested features: ${NETWORK}-runtime\n" && \
4648
echo "Fork from: $REPLICA_FROM\n" && \
4749
cargo build --features=try-runtime,${NETWORK}-runtime --release
4850

49-
CMD cargo run --release --features ${NETWORK}-runtime,try-runtime -- try-runtime --runtime target/release/wbuild/${NETWORK}-runtime/${NETWORK}_runtime.compact.compressed.wasm -lruntime=debug -ltry-runtime::cli=debug on-runtime-upgrade --checks live --uri $REPLICA_FROM
51+
CMD cargo run --release --features ${NETWORK}-runtime,try-runtime -- try-runtime --runtime target/release/wbuild/${WASM_NAME}-runtime/${WASM_NAME}_runtime.compact.compressed.wasm -lruntime=debug -ltry-runtime::cli=debug on-runtime-upgrade --checks live --uri $REPLICA_FROM

‎.docker/docker-compose.tmp-forkless-data.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ services:
1313
- "MAINNET_TAG={{ MAINNET_TAG }}"
1414
- "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
1515
- "REPLICA_FROM={{ REPLICA_FROM }}"
16+
- "WASM_NAME={{ WASM_NAME }}"
1617
context: ../
1718
dockerfile: .docker/Dockerfile-parachain-upgrade-data
1819
image: node-parachain

‎.docker/docker-compose.tmp-forkless-nodata.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
1313
- "MAINNET_TAG={{ MAINNET_TAG }}"
1414
- "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
15+
- "WASM_NAME={{ WASM_NAME }}"
1516
context: ../
1617
dockerfile: .docker/Dockerfile-parachain-upgrade
1718
image: node-parachain

‎.docker/docker-compose.tmp-node.j2‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ services:
1212
- "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
1313
- "MAINNET_TAG={{ MAINNET_TAG }}"
1414
- "MAINNET_BRANCH={{ MAINNET_BRANCH }}"
15+
- "WASM_NAME={{ WASM_NAME }}"
1516
context: ../
1617
dockerfile: .docker/Dockerfile-parachain-node-only
1718
image: node-parachain

‎.docker/docker-compose.tmp-try-runtime.j2‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ services:
88
args:
99
- "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
1010
- "NETWORK={{ NETWORK }}"
11-
- "REPLICA_FROM={{ REPLICA_FROM }}"
11+
- "REPLICA_FROM={{ REPLICA_FROM }}"
12+
- "WASM_NAME={{ WASM_NAME }}"
1213
image: try-runtime
1314
container_name: try-runtime
1415
expose:

‎.docker/forkless-config/launch-config-forkless-data.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
{
8989
"bin": "/unique-chain/current/release/unique-collator",
9090
"upgradeBin": "/unique-chain/target/release/unique-collator",
91-
"upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
91+
"upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm",
9292
"id": "1000",
9393
"balance": "1000000000000000000000000",
9494
"chainRawInitializer": [

‎.docker/forkless-config/launch-config-forkless-nodata.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
{
8989
"bin": "/unique-chain/current/release/unique-collator",
9090
"upgradeBin": "/unique-chain/target/release/unique-collator",
91-
"upgradeWasm": "/unique-chain/target/release/wbuild/{{ NETWORK }}-runtime/{{ NETWORK }}_runtime.compact.compressed.wasm",
91+
"upgradeWasm": "/unique-chain/target/release/wbuild/{{ WASM_NAME }}-runtime/{{ WASM_NAME }}_runtime.compact.compressed.wasm",
9292
"id": "1000",
9393
"balance": "1000000000000000000000000",
9494
"nodes": [

0 commit comments

Comments
 (0)