From 036aece6500a503da3bd36648492f335406a7aa0 Mon Sep 17 00:00:00 2001
From: Konstantin Astakhov <astahov@rocketscien.se>
Date: Fri, 26 Aug 2022 11:42:38 +0000
Subject: [PATCH] correct build commands for parachains


---
--- a/.docker/Dockerfile-xcm
+++ b/.docker/Dockerfile-xcm
@@ -33,13 +33,13 @@
 
 ARG PROFILE=release
 ARG FEATURE=
-ARG REPO_URL=
 ARG BRANCH=
 
 
 WORKDIR /unique_parachain
 
-RUN git clone $REPO_URL -b $BRANCH . && \
+RUN git clone -b $BRANCH https://github.com/UniqueNetwork/unique-chain.git && \
+    cd unique-chain && \
     cargo build --features=$FEATURE --$PROFILE
 
 # ===== BUILD POLKADOT =====
@@ -93,12 +93,15 @@
 
 RUN git clone -b $CUMULUS_BUILD_BRANCH --depth 1 https://github.com/paritytech/cumulus.git && \
     cd cumulus && \
-    cargo build --release
+    cargo build --release --locked -p polkadot-parachain
 
 # ===== RUN ======
 
 FROM ubuntu:20.04
 
+ARG POLKADOT_LAUNCH_BRANCH=
+ENV POLKADOT_LAUNCH_BRANCH $POLKADOT_LAUNCH_BRANCH
+
 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 && \
@@ -107,7 +110,7 @@
       nvm install v16.16.0 && \
       nvm use v16.16.0
 
-RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing
+RUN git clone https://github.com/uniquenetwork/polkadot-launch -b $POLKADOT_LAUNCH_BRANCH
 
 RUN export NVM_DIR="$HOME/.nvm" && \
     [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
@@ -115,7 +118,7 @@
     npm install --global yarn && \
     yarn install
 
-COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
+COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
 COPY --from=builder-moonbeam /unique_parachain/moonbeam/target/release/moonbeam /moonbeam/target/release/
 COPY --from=builder-cumulus /unique_parachain/cumulus/target/release/polkadot-parachain /cumulus/target/release/cumulus
--- a/.docker/docker-compose-xcm.yml
+++ b/.docker/docker-compose-xcm.yml
@@ -5,8 +5,6 @@
     build:
       context: ../
       dockerfile: .docker/Dockerfile-xcm
-    image: xcm_nodes
-    container_name: xcm_nodes
     expose:
       - 9844
       - 9944
--- a/.docker/docker-compose.tmp-xcm-quartz.yml
+++ b/.docker/docker-compose.tmp-xcm-quartz.yml
@@ -6,12 +6,14 @@
       args:
         - "RUST_TOOLCHAIN=nightly-2022-07-24"
         - "BRANCH=release-v927020"
-        - "REPO_URL=https://github.com/UniqueNetwork/unique-chain.git"
         - "FEATURE=quartz-runtime"
         - "POLKADOT_BUILD_BRANCH=release-v0.9.27"
         - "ACALA_BUILD_BRANCH=2.9.0"
         - "MOONBEAM_BUILD_BRANCH=v0.25.0"
         - "CUMULUS_BUILD_BRANCH=release-v0.9.230"
+        - "POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec"
+    image: xcm_nodes_quartz
+    container_name: xcm_nodes_quartz
     volumes:
        - type: bind
          source: ./xcm-config/launch-config-xcm-quartz.json
--- a/.docker/docker-compose.tmp-xcm-unique.yml
+++ b/.docker/docker-compose.tmp-xcm-unique.yml
@@ -12,6 +12,9 @@
         - "ACALA_BUILD_BRANCH=2.9.0"
         - "MOONBEAM_BUILD_BRANCH=v0.25.0"
         - "CUMULUS_BUILD_BRANCH=release-v0.9.230"
+        - "POLKADOT_LAUNCH_BRANCH=feature/rewrite-chain-id-in-spec"          
+    image: xcm_nodes_unique
+    container_name: xcm_nodes_unique         
     volumes:
        - type: bind
          source: ./xcm-config/launch-config-xcm-unique.json
--- /dev/null
+++ b/.docker/docker-compose.tmp-xcm.j2
@@ -0,0 +1,21 @@
+version: "3.5"
+
+services:
+  xcm_nodes:
+    build:
+      args:
+        - "RUST_TOOLCHAIN={{ RUST_TOOLCHAIN }}"
+        - "BRANCH={{ BRANCH }}"
+        - "FEATURE={{ FEATURE }}"
+        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
+        - "ACALA_BUILD_BRANCH={{ ACALA_BUILD_BRANCH }}"
+        - "MOONBEAM_BUILD_BRANCH={{ MOONBEAM_BUILD_BRANCH }}"
+        - "CUMULUS_BUILD_BRANCH={{ CUMULUS_BUILD_BRANCH }}"
+        - "POLKADOT_LAUNCH_BRANCH={{ POLKADOT_LAUNCH_BRANCH }}"
+    image: xcm_nodes_{{ NETWORK }}
+    container_name: xcm_nodes_{{ NETWORK }}
+    volumes:
+       - type: bind
+         source: ./xcm-config/launch-config-xcm-{{ NETWORK }}.json
+         target: /polkadot-launch/launch-config.json
+         read_only: true          

-- 
gitstuff