git.delta.rocks / unique-network / refs/commits / b1ec0e65b012

--- a/.docker/Dockerfile-chain-dev
+++ b/.docker/Dockerfile-chain-dev
@@ -10,8 +10,8 @@
 
 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
-ARG POLKA_VERSION=release-v0.9.24
+ARG RUST_TOOLCHAIN=
+ARG POLKADOT_BUILD_BRANCH=
 ARG BRANCH=
 ARG REPO_URL=
 ARG FEATURE=
@@ -26,4 +26,4 @@
 
 RUN cargo build --release
 
-CMD cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external

--- a/.docker/Dockerfile-parachain
+++ b/.docker/Dockerfile-parachain
@@ -2,19 +2,21 @@
 FROM ubuntu:20.04 as rust-builder
 LABEL maintainer="Unique.Network"
 
-ARG RUST_TOOLCHAIN=nightly-2022-05-11
+ARG RUST_TOOLCHAIN=
 
 ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
 ENV CARGO_HOME="/cargo-home"
 ENV PATH="/cargo-home/bin:$PATH"
 
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
 
+
 RUN apt-get update && \
-    apt-get install -y cmake pkg-config libssl-dev git clang && \
+    apt-get install -y curl cmake pkg-config libssl-dev git clang && \
     apt-get clean && \
     rm -r /var/lib/apt/lists/*
 
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+
 RUN rustup toolchain uninstall $(rustup toolchain list) && \
     rustup toolchain install $RUST_TOOLCHAIN && \
     rustup default $RUST_TOOLCHAIN && \
@@ -31,23 +33,25 @@
 
 ARG PROFILE=release
 ARG FEATURE=
+ARG REPO_URL=
+ARG BRANCH=
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone $REPO_URL -b $BRANCH
-RUN cargo build $FEATURE --$PROFILE
+RUN git clone $REPO_URL -b $BRANCH && \
+    cargo build --features=$FEATURE --$PROFILE
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot
 
-ARG POLKA_VERSION=release-v0.9.24
-ENV POLKA_VERSION $POLKA_VERSION
+ARG POLKADOT_BUILD_BRANCH=
+ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
 
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
+RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
     cd polkadot && \
     cargo build --release
 

40RUN mkdir /unique_parachain40RUN mkdir /unique_parachain
41WORKDIR /unique_parachain41WORKDIR /unique_parachain
4242
43RUN git clone $REPO_URL -b $MAINNET_BRANCH .43RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
44RUN cargo build --features=$FEATURE --$PROFILE44    cargo build --features=$FEATURE --$PROFILE
4545
4646
47# ===== BUILD target version ======47# ===== BUILD target version ======
55RUN mkdir /unique_parachain55RUN mkdir /unique_parachain
56WORKDIR /unique_parachain56WORKDIR /unique_parachain
5757
58RUN git clone $REPO_URL -b $BRANCH .58RUN git clone $REPO_URL -b $BRANCH . && \
59RUN cargo build --features=$FEATURE --$PROFILE59    cargo build --features=$FEATURE --$PROFILE
6060
61RUN ls -la /unique_parachain
62RUN ls -la /unique_parachain/target/release/wbuild
63
64# ===== BUILD POLKADOT =====61# ===== BUILD POLKADOT =====
65FROM rust-builder as builder-polkadot62FROM rust-builder as builder-polkadot
6663

--- a/.docker/docker-compose.tmp.j2
+++ b/.docker/docker-compose.tmp.j2
@@ -8,6 +8,6 @@
         - "BRANCH={{ BRANCH }}"
         - "REPO_URL={{ REPO_URL }}"
         - "FEATURE={{ FEATURE }}"
-        - "POLKA_VERSION={{ POLKA_VERSION }}"
+        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
 
-    command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
+    command: cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external

--- a/.github/workflows/node_build_test.yml
+++ b/.github/workflows/node_build_test.yml
@@ -16,13 +16,11 @@
 
 #Define Workflow variables
 env:
-  RUST_TOOLCHAIN: nightly-2022-05-11
   REPO_URL: ${{ github.server_url }}/${{ github.repository }}
-  POLKA_VERSION: release-v0.9.24
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  build:
+  dev_build_test:
     # The type of runner that the job will run on
     runs-on: self-hosted-ci
 
@@ -64,6 +62,9 @@
         with:
           ref: ${{ github.head_ref }}  #Checking out head commit
 
+      - name: Read .env file
+        uses: xom9ikk/dotenv@v1.0.2
+
       - name: Generate ENV related extend file for docker-compose
         uses: cuchi/jinja2-action@v1.2.0
         with:
@@ -72,7 +73,7 @@
           variables: |
             REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
             RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
-            POLKA_VERSION=${{ env.POLKA_VERSION }}
+            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
             FEATURE='${{ matrix.features }}'
             BRANCH=${{ github.head_ref }}