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
1010
11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1212
13ARG RUST_TOOLCHAIN=nightly-2022-05-1113ARG RUST_TOOLCHAIN=
14ARG POLKA_VERSION=release-v0.9.2414ARG POLKADOT_BUILD_BRANCH=
15ARG BRANCH=15ARG BRANCH=
16ARG REPO_URL=16ARG REPO_URL=
17ARG FEATURE=17ARG FEATURE=
2626
27RUN cargo build --release27RUN cargo build --release
2828
29CMD cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external29CMD cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
3030
modified.docker/Dockerfile-parachaindiffbeforeafterboth
2FROM ubuntu:20.04 as rust-builder2FROM ubuntu:20.04 as rust-builder
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ARG RUST_TOOLCHAIN=nightly-2022-05-115ARG RUST_TOOLCHAIN=
66
7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN7ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
8ENV CARGO_HOME="/cargo-home"8ENV CARGO_HOME="/cargo-home"
9ENV PATH="/cargo-home/bin:$PATH"9ENV PATH="/cargo-home/bin:$PATH"
1010
11RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1211
12
13RUN apt-get update && \13RUN apt-get update && \
14    apt-get install -y cmake pkg-config libssl-dev git clang && \14    apt-get install -y curl cmake pkg-config libssl-dev git clang && \
15    apt-get clean && \15    apt-get clean && \
16    rm -r /var/lib/apt/lists/*16    rm -r /var/lib/apt/lists/*
17
18RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
1719
18RUN rustup toolchain uninstall $(rustup toolchain list) && \20RUN rustup toolchain uninstall $(rustup toolchain list) && \
19    rustup toolchain install $RUST_TOOLCHAIN && \21    rustup toolchain install $RUST_TOOLCHAIN && \
3133
32ARG PROFILE=release34ARG PROFILE=release
33ARG FEATURE=35ARG FEATURE=
36ARG REPO_URL=
37ARG BRANCH=
3438
35RUN mkdir /unique_parachain39RUN mkdir /unique_parachain
36WORKDIR /unique_parachain40WORKDIR /unique_parachain
3741
38RUN git clone $REPO_URL -b $BRANCH42RUN git clone $REPO_URL -b $BRANCH && \
39RUN cargo build $FEATURE --$PROFILE43    cargo build --features=$FEATURE --$PROFILE
4044
41# ===== BUILD POLKADOT =====45# ===== BUILD POLKADOT =====
42FROM rust-builder as builder-polkadot46FROM rust-builder as builder-polkadot
4347
44ARG POLKA_VERSION=release-v0.9.2448ARG POLKADOT_BUILD_BRANCH=
45ENV POLKA_VERSION $POLKA_VERSION49ENV POLKADOT_BUILD_BRANCH $POLKADOT_BUILD_BRANCH
4650
47RUN mkdir /unique_parachain51RUN mkdir /unique_parachain
48WORKDIR /unique_parachain52WORKDIR /unique_parachain
4953
50RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \54RUN git clone -b $POLKADOT_BUILD_BRANCH --depth 1 https://github.com/paritytech/polkadot.git && \
51    cd polkadot && \55    cd polkadot && \
52    cargo build --release56    cargo build --release
5357
modified.docker/Dockerfile-parachain-upgradediffbeforeafterboth
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
modified.docker/docker-compose.tmp.j2diffbeforeafterboth
8        - "BRANCH={{ BRANCH }}"8        - "BRANCH={{ BRANCH }}"
9        - "REPO_URL={{ REPO_URL }}"9        - "REPO_URL={{ REPO_URL }}"
10        - "FEATURE={{ FEATURE }}"10        - "FEATURE={{ FEATURE }}"
11        - "POLKA_VERSION={{ POLKA_VERSION }}"11        - "POLKADOT_BUILD_BRANCH={{ POLKADOT_BUILD_BRANCH }}"
1212
13    command: cargo run --release $FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external13    command: cargo run --release --features=$FEATURE -- --dev -linfo --unsafe-ws-external --rpc-cors=all --unsafe-rpc-external
1414
modified.github/workflows/node_build_test.ymldiffbeforeafterboth
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