git.delta.rocks / unique-network / refs/commits / 42419f35e258

difftreelog

Swapped branches beetween two stages of build

Alexander Aksenov2022-08-09parent: #5524698.patch.diff
in: master

2 files changed

modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -28,18 +28,20 @@
 #RUN mkdir /unique_parachain
 #WORKDIR /unique_parachain
 
+
 # ===== BUILD current version ======
 FROM rust-builder as builder-unique-current
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG BRANCH=
+ARG MAINNET_BRANCH=
 ARG REPO_URL=
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone $REPO_URL -b $BRANCH .
+RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL"
+RUN git clone $REPO_URL -b $MAINNET_BRANCH .
 RUN cargo build $FEATURE --$PROFILE
 
 
@@ -48,14 +50,13 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG MAINNET_BRANCH=
+ARG BRANCH=
 ARG REPO_URL=
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN echo "$MAINNET_BRANCH" && echo "$REPO_URL"
-RUN git clone $REPO_URL -b $MAINNET_BRANCH .
+RUN git clone $REPO_URL -b $BRANCH .
 RUN cargo build $FEATURE --$PROFILE
 
 
modified.docker/launch-config.jsondiffbeforeafterboth
84 },84 },
85 "parachains": [85 "parachains": [
86 {86 {
87 "bin": "../unique-chain/current/release/unique-collator",87 "bin": "../unique-chain/current/release/unique-collator", #Mainnet TAG
88 "upgradeBin": "../unique-chain/target/release/unique-collator",88 "upgradeBin": "../unique-chain/target/release/unique-collator", # version in PR develop to master
89 "upgradeWasm": "../unique-chain/target/release/wbuild/opal-runtime/opal_runtime.compact.compressed.wasm",89 "upgradeWasm": "../unique-chain/target/release/wbuild/opal-runtime/opal_runtime.compact.compressed.wasm",
90 "id": "1000",90 "id": "1000",
91 "balance": "1000000000000000000000000",91 "balance": "1000000000000000000000000",