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
 

--- a/.docker/Dockerfile-parachain-upgrade
+++ b/.docker/Dockerfile-parachain-upgrade
@@ -40,8 +40,8 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone $REPO_URL -b $MAINNET_BRANCH .
-RUN cargo build --features=$FEATURE --$PROFILE
+RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \
+    cargo build --features=$FEATURE --$PROFILE
 
 
 # ===== BUILD target version ======
@@ -55,11 +55,8 @@
 RUN mkdir /unique_parachain
 WORKDIR /unique_parachain
 
-RUN git clone $REPO_URL -b $BRANCH .
-RUN cargo build --features=$FEATURE --$PROFILE
-
-RUN ls -la /unique_parachain
-RUN ls -la /unique_parachain/target/release/wbuild
+RUN git clone $REPO_URL -b $BRANCH . && \
+    cargo build --features=$FEATURE --$PROFILE
 
 # ===== BUILD POLKADOT =====
 FROM rust-builder as builder-polkadot

--- 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

1616
17#Define Workflow variables17#Define Workflow variables
18env:18env:
19  RUST_TOOLCHAIN: nightly-2022-05-11
20  REPO_URL: ${{ github.server_url }}/${{ github.repository }}19  REPO_URL: ${{ github.server_url }}/${{ github.repository }}
21  POLKA_VERSION: release-v0.9.24
2220
23# A workflow run is made up of one or more jobs that can run sequentially or in parallel21# A workflow run is made up of one or more jobs that can run sequentially or in parallel
24jobs:22jobs:
25  build:23  dev_build_test:
26    # The type of runner that the job will run on24    # The type of runner that the job will run on
27    runs-on: self-hosted-ci25    runs-on: self-hosted-ci
2826
64        with:62        with:
65          ref: ${{ github.head_ref }}  #Checking out head commit63          ref: ${{ github.head_ref }}  #Checking out head commit
64
65      - name: Read .env file
66        uses: xom9ikk/dotenv@v1.0.2
6667
67      - name: Generate ENV related extend file for docker-compose68      - name: Generate ENV related extend file for docker-compose
68        uses: cuchi/jinja2-action@v1.2.069        uses: cuchi/jinja2-action@v1.2.0
69        with:70        with:
70          template: .docker/docker-compose.tmp.j271          template: .docker/docker-compose.tmp.j2
71          output_file: .docker/docker-compose.${{ matrix.network }}.yml72          output_file: .docker/docker-compose.${{ matrix.network }}.yml
72          variables: |73          variables: |
73            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git74            REPO_URL=${{ github.server_url }}/${{ github.repository }}.git
74            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}75            RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
75            POLKA_VERSION=${{ env.POLKA_VERSION }}76            POLKADOT_BUILD_BRANCH=${{ env.POLKADOT_BUILD_BRANCH }}
76            FEATURE='${{ matrix.features }}'77            FEATURE='${{ matrix.features }}'
77            BRANCH=${{ github.head_ref }}78            BRANCH=${{ github.head_ref }}
7879
79      - name: Show build configuration80      - name: Show build configuration
80        run: cat .docker/docker-compose.${{ matrix.network }}.yml81        run: cat .docker/docker-compose.${{ matrix.network }}.yml