From 42419f35e258a5adad0e2f397f688e5358b23026 Mon Sep 17 00:00:00 2001 From: Alexander Aksenov Date: Tue, 09 Aug 2022 10:03:34 +0000 Subject: [PATCH] Swapped branches beetween two stages of build --- --- 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 --- a/.docker/launch-config.json +++ b/.docker/launch-config.json @@ -84,8 +84,8 @@ }, "parachains": [ { - "bin": "../unique-chain/current/release/unique-collator", - "upgradeBin": "../unique-chain/target/release/unique-collator", + "bin": "../unique-chain/current/release/unique-collator", #Mainnet TAG + "upgradeBin": "../unique-chain/target/release/unique-collator", # version in PR develop to master "upgradeWasm": "../unique-chain/target/release/wbuild/opal-runtime/opal_runtime.compact.compressed.wasm", "id": "1000", "balance": "1000000000000000000000000", -- gitstuff