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

difftreelog

Build Args definition has been changed. Docker linting notices has been fixed.

Alexander Aksenov2022-08-12parent: #94bc7f5.patch.diff
in: master

5 files changed

modified.docker/Dockerfile-chain-devdiffbeforeafterboth
--- 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
modified.docker/Dockerfile-parachaindiffbeforeafterboth
--- 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
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
before · .docker/Dockerfile-parachain-upgrade
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN262728#RUN mkdir /unique_parachain29#WORKDIR /unique_parachain303132# ===== BUILD current version ======33FROM rust-builder as builder-unique-current3435ARG PROFILE=release36ARG FEATURE=37ARG MAINNET_BRANCH=38ARG REPO_URL=3940RUN mkdir /unique_parachain41WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH .44RUN cargo build --features=$FEATURE --$PROFILE454647# ===== BUILD target version ======48FROM rust-builder as builder-unique-target4950ARG PROFILE=release51ARG FEATURE=52ARG BRANCH=53ARG REPO_URL=5455RUN mkdir /unique_parachain56WORKDIR /unique_parachain5758RUN git clone $REPO_URL -b $BRANCH .59RUN cargo build --features=$FEATURE --$PROFILE6061RUN ls -la /unique_parachain62RUN ls -la /unique_parachain/target/release/wbuild6364# ===== BUILD POLKADOT =====65FROM rust-builder as builder-polkadot6667ARG POLKADOT_BUILD_BRANCH=68ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6970RUN mkdir /unique_parachain71WORKDIR /unique_parachain7273RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \74    cd polkadot && \75    cargo build --release7677# ===== RUN ======7879FROM ubuntu:20.048081ARG RUNTIME=82ENV RUNTIME $RUNTIME8384RUN apt-get -y update && \85      apt-get -y install curl git && \86      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \87      export NVM_DIR="$HOME/.nvm" && \88      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \89      nvm install v16.16.0 && \90      nvm use v16.16.09192RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing9394RUN export NVM_DIR="$HOME/.nvm" && \95    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \96    cd /polkadot-launch && \97    npm install --global yarn && \98    yarn install99100RUN echo "$RUNTIME"101102COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/103COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/104COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm105106COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/107COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm108				      109110CMD export NVM_DIR="$HOME/.nvm" && \111    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \112    cd /polkadot-launch && \113    yarn start launch-config.json --test-upgrade-parachains
after · .docker/Dockerfile-parachain-upgrade
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=67ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"10ENV TZ=UTC11RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone1213RUN apt-get update && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1920RUN rustup toolchain uninstall $(rustup toolchain list) && \21    rustup toolchain install $RUST_TOOLCHAIN && \22    rustup default $RUST_TOOLCHAIN && \23    rustup target list --installed && \24    rustup show25RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN262728#RUN mkdir /unique_parachain29#WORKDIR /unique_parachain303132# ===== BUILD current version ======33FROM rust-builder as builder-unique-current3435ARG PROFILE=release36ARG FEATURE=37ARG MAINNET_BRANCH=38ARG REPO_URL=3940RUN mkdir /unique_parachain41WORKDIR /unique_parachain4243RUN git clone $REPO_URL -b $MAINNET_BRANCH . && \44    cargo build --features=$FEATURE --$PROFILE454647# ===== BUILD target version ======48FROM rust-builder as builder-unique-target4950ARG PROFILE=release51ARG FEATURE=52ARG BRANCH=53ARG REPO_URL=5455RUN mkdir /unique_parachain56WORKDIR /unique_parachain5758RUN git clone $REPO_URL -b $BRANCH . && \59    cargo build --features=$FEATURE --$PROFILE6061# ===== BUILD POLKADOT =====62FROM rust-builder as builder-polkadot6364ARG POLKADOT_BUILD_BRANCH=65ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH6667RUN mkdir /unique_parachain68WORKDIR /unique_parachain6970RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \71    cd polkadot && \72    cargo build --release7374# ===== RUN ======7576FROM ubuntu:20.047778ARG RUNTIME=79ENV RUNTIME $RUNTIME8081RUN apt-get -y update && \82      apt-get -y install curl git && \83      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \84      export NVM_DIR="$HOME/.nvm" && \85      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \86      nvm install v16.16.0 && \87      nvm use v16.16.08889RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing9091RUN export NVM_DIR="$HOME/.nvm" && \92    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \93    cd /polkadot-launch && \94    npm install --global yarn && \95    yarn install9697RUN echo "$RUNTIME"9899COPY --from=builder-unique-current /unique_parachain/target/release/unique-collator /unique-chain/current/release/100COPY --from=builder-unique-target /unique_parachain/target/release/unique-collator /unique-chain/target/release/101COPY --from=builder-unique-target /unique_parachain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm /unique-chain/target/release/wbuild/"$RUNTIME"-runtime/"$RUNTIME"_runtime.compact.compressed.wasm102103COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/104COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm /polkadot/target/release/wbuild/westend-runtime/westend_runtime.compact.compressed.wasm105				      106107CMD export NVM_DIR="$HOME/.nvm" && \108    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \109    cd /polkadot-launch && \110    yarn start launch-config.json --test-upgrade-parachains
modified.docker/docker-compose.tmp.j2diffbeforeafterboth
--- 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
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
--- 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 }}