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
before · .docker/Dockerfile-parachain
1# ===== Rust builder =====2FROM ubuntu:20.04 as rust-builder3LABEL maintainer="Unique.Network"45ARG RUST_TOOLCHAIN=nightly-2022-05-1167ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN8ENV CARGO_HOME="/cargo-home"9ENV PATH="/cargo-home/bin:$PATH"1011RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none1213RUN apt-get update && \14    apt-get install -y cmake pkg-config libssl-dev git clang && \15    apt-get clean && \16    rm -r /var/lib/apt/lists/*1718RUN rustup toolchain uninstall $(rustup toolchain list) && \19    rustup toolchain install $RUST_TOOLCHAIN && \20    rustup default $RUST_TOOLCHAIN && \21    rustup target list --installed && \22    rustup show23RUN rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN242526RUN mkdir /unique_parachain27WORKDIR /unique_parachain2829# ===== BUILD ======30FROM rust-builder as builder-unique3132ARG PROFILE=release33ARG FEATURE=3435RUN mkdir /unique_parachain36WORKDIR /unique_parachain3738RUN git clone $REPO_URL -b $BRANCH39RUN cargo build $FEATURE --$PROFILE4041# ===== BUILD POLKADOT =====42FROM rust-builder as builder-polkadot4344ARG POLKA_VERSION=release-v0.9.2445ENV POLKA_VERSION $POLKA_VERSION4647RUN mkdir /unique_parachain48WORKDIR /unique_parachain4950RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \51    cd polkadot && \52    cargo build --release5354# ===== RUN ======5556FROM ubuntu:20.045758RUN apt-get -y update && \59      apt-get -y upgrade && \60      apt-get -y install curl git && \61      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \62      export NVM_DIR="$HOME/.nvm" && \63      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \64      nvm install v16.16.0 && \65      nvm use v16.16.06667RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing6869RUN export NVM_DIR="$HOME/.nvm" && \70    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \71    cd /polkadot-launch && \72    npm install --global yarn && \73    yarn install7475COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/76COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/7778COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json798081CMD export NVM_DIR="$HOME/.nvm" && \82    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \83    cd /polkadot-launch && \84    yarn start launch-config.json
after · .docker/Dockerfile-parachain
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"10111213RUN 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_TOOLCHAIN262728RUN mkdir /unique_parachain29WORKDIR /unique_parachain3031# ===== BUILD ======32FROM rust-builder as builder-unique3334ARG PROFILE=release35ARG FEATURE=36ARG REPO_URL=37ARG BRANCH=3839RUN mkdir /unique_parachain40WORKDIR /unique_parachain4142RUN git clone $REPO_URL -b $BRANCH && \43    cargo build --features=$FEATURE --$PROFILE4445# ===== BUILD POLKADOT =====46FROM rust-builder as builder-polkadot4748ARG POLKADOT_BUILD_BRANCH=49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH5051RUN mkdir /unique_parachain52WORKDIR /unique_parachain5354RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \55    cd polkadot && \56    cargo build --release5758# ===== RUN ======5960FROM ubuntu:20.046162RUN apt-get -y update && \63      apt-get -y upgrade && \64      apt-get -y install curl git && \65      curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \66      export NVM_DIR="$HOME/.nvm" && \67      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \68      nvm install v16.16.0 && \69      nvm use v16.16.07071RUN git clone https://github.com/uniquenetwork/polkadot-launch -b feature/runtime-upgrade-testing7273RUN export NVM_DIR="$HOME/.nvm" && \74    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \75    cd /polkadot-launch && \76    npm install --global yarn && \77    yarn install7879COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/80COPY --from=builder-polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/8182COPY --from=builder-unique /unique_parachain/launch-config.json /polkadot-launch/launch-config.json838485CMD export NVM_DIR="$HOME/.nvm" && \86    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \87    cd /polkadot-launch && \88    yarn start launch-config.json
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
--- 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
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 }}