git.delta.rocks / unique-network / refs/commits / 7c5f266f6a1f

difftreelog

arg fix

akNFT2021-09-08parent: #b77d872.patch.diff
in: master

27 files changed

added..env.swpdiffbeforeafterboth

binary blob — no preview

added.envdiffbeforeafterboth

no changes

deleted.env-parachaindiffbeforeafterboth

no changes

deleted9944.logdiffbeforeafterboth

no changes

modifiedDockerfile-parachaindiffbeforeafterboth
2FROM phusion/baseimage:focal-1.0.0 as builder2FROM phusion/baseimage:focal-1.0.0 as builder
3LABEL maintainer="Unique.Network"3LABEL maintainer="Unique.Network"
44
5ENV WASM_TOOLCHAIN=nightly-2021-06-17
6ENV POLKA_VERSION=v0.9.8
7ENV NFT_BRANCH=develop
8#ENV USER=***
9#ENV PASS=***
105
6
7ARG RUST_TOOLCHAIN=nightly-2021-06-17
8ARG RUST_C=1.55.0-nightly
9ARG POLKA_VERSION=v0.9.8
10ARG NFT_BRANCH=develop
11
12#ARG USER=***
13#ARG PASS=***
14
15
16ENV RUST_TOOLCHAIN $RUST_TOOLCHAIN
17ENV RUST_C $RUST_C
18ENV POLKA_VERSION $POLKA_VERSION
19ENV NFT_BRANCH $NFT_BRANCH
20
21
22RUN echo $RUST_TOOLCHAIN
23RUN echo $RUST_C
24RUN echo $POLKA_VERSION
25RUN echo $NFT_BRANCH
26
27
28
11ARG PROFILE=release29ARG PROFILE=release
1230
13RUN apt-get update && \31RUN apt-get update && \
14 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \32 apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \
15 apt-get install -y cmake pkg-config libssl-dev git clang33 apt-get install -y cmake pkg-config libssl-dev git clang
1634
17# Get project and run it35# Get project and run it
1836
23WORKDIR /nft_parachain41WORKDIR /nft_parachain
24COPY . .42COPY . .
2543
44
26RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y45RUN export CARGO_HOME="/cargo-home" && curl https://sh.rustup.rs -sSf | sh -s -- -y
27RUN export PATH="/cargo-home/bin:$PATH" && \46RUN export PATH="/cargo-home/bin:$PATH" && \
28 export CARGO_HOME="/cargo-home" && \47 export CARGO_HOME="/cargo-home" && \
29 cargo fetch48 cargo fetch
3049
31RUN export PATH="/cargo-home/bin:$PATH" && \50RUN export PATH="/cargo-home/bin:$PATH" && \
32 export CARGO_HOME="/cargo-home" && \51 export CARGO_HOME="/cargo-home" && \
33 rustup toolchain uninstall $(rustup toolchain list) && \52 rustup toolchain uninstall $(rustup toolchain list) && \
34 rustup toolchain install $WASM_TOOLCHAIN && \53 rustup toolchain install $RUST_TOOLCHAIN && \
35 rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \54 rustup toolchain install $RUST_C && \
55 rustup target add wasm32-unknown-unknown --toolchain $RUST_TOOLCHAIN && \
36 rustup default $WASM_TOOLCHAIN && \56 rustup default $RUST_TOOLCHAIN && \
37 rustup target list --installed && \57 rustup target list --installed && \
38 rustup show58 rustup show
3959
40RUN export PATH="/cargo-home/bin:$PATH" && \60RUN export PATH="/cargo-home/bin:$PATH" && \
41 export CARGO_HOME="/cargo-home" && \61 export CARGO_HOME="/cargo-home" && \
42 cargo build "--$PROFILE"62 cargo build "--$PROFILE"
43 # && \63 # && \
44 # cargo test64 # cargo test
65
66
4567
46RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && cd polkadot && \68RUN git clone -b $POLKA_VERSION --depth 1 https://github.com/paritytech/polkadot.git && \
69 cd polkadot && \
70 git tag -n && \
47 export PATH="/cargo-home/bin:$PATH" && \71 export PATH="/cargo-home/bin:$PATH" && \
48 export CARGO_HOME="/cargo-home" && \72 export CARGO_HOME="/cargo-home" && \
49 cargo build --release73 cargo build --release
81 npm install --global yarn && \105 npm install --global yarn && \
82 yarn install && \106 yarn install && \
83 yarn build && \107 yarn build && \
84 yarn start launch-config.json108 yarn start launch-config.json
85
deletedalice.logdiffbeforeafterboth

no changes

deletedbob.logdiffbeforeafterboth

no changes

deleteddave.logdiffbeforeafterboth

no changes

modifieddocker-compose-tests-parachain.ymldiffbeforeafterboth
1version: "3.5"1version: "3.5"
22
3services:3services:
4 node_validator1:4 blockchain_nodes:
5 image: nft_node_test5 image: blockchain_nodes
6 container_name: validator1_test6 container_name: blockchain_nodes
7 ports:7 ports:
8 - 9944:99448 - 9944:9944
9 - 9844:98449 - 9844:9844
10 - 9933:993310 - 9933:9933
11 build:11 build:
12 context: ./12 context: ./
13 dockerfile: Dockerfile-parachain13 dockerfile: Dockerfile-parachain
14 args:
15 - RUST_TOOLCHAIN=${RUST_TOOLCHAIN:?err}
16 - RUST_C=${RUST_C:?err}
17 - POLKA_VERSION=${POLKA_VERSION:?err}
18 - NFT_BRANCH=${NFT_BRANCH:?err}
14 volumes:19 volumes:
15# - ./chain-data:/chain-data20# - ./chain-data:/chain-data
16 - ./launch-config.json:/polkadot-launch/launch-config.json21 - ./launch-config.json:/polkadot-launch/launch-config.json
17 - ./runtime_types.json:/polkadot-launch/runtime_types.json22 - ./runtime_types.json:/polkadot-launch/runtime_types.json
18 environment:
19 - WASM_TOOLCHAIN=${WASM_TOOLCHAIN}
20 - POLKA_VERSION=${POLKA_VERSION}
21 - NFT_BRANCH=${NFT_BRANCH}
22 env_file:23 env_file:
23 - ./.env-parachain24 - ./.env
24 networks:25 networks:
25 - node_test_network26 - node_test_network
26 #command: bash -c "yarn --cwd polkadot-launch start"27 #command: bash -c "yarn --cwd polkadot-launch start"
27 #command: bash -c 'while true; do sleep 60; df -h; done'28 #command: bash -c 'while true; do sleep 60; df -h; done'
2829
29 integration_tests:30 integration_tests:
30 container_name: integration_test31 container_name: integration_tests
31# ports:
32# - 9944:9944
33# - 9844:9844
34# - 9933:9933
35 image: int_test32 image: integration_tests
36 build:33 build:
37 context: ./34 context: ./
38 dockerfile: Dockerfile-tests35 dockerfile: Dockerfile-tests
43 networks:40 networks:
44 - node_test_network41 - node_test_network
45 depends_on:42 depends_on:
46 - node_validator143 - blockchain_nodes
4744
48# unit_tests:45# unit_tests:
49# container_name: unit_test46# container_name: unit_test
addedmochawesome-report/assets/MaterialIcons-Regular.woffdiffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/MaterialIcons-Regular.woff2diffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/app.cssdiffbeforeafterboth

no changes

addedmochawesome-report/assets/app.css.mapdiffbeforeafterboth

no changes

addedmochawesome-report/assets/app.jsdiffbeforeafterboth

no changes

addedmochawesome-report/assets/app.js.LICENSE.txtdiffbeforeafterboth

no changes

addedmochawesome-report/assets/app.js.mapdiffbeforeafterboth

no changes

addedmochawesome-report/assets/roboto-light-webfont.woffdiffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/roboto-light-webfont.woff2diffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/roboto-medium-webfont.woffdiffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/roboto-medium-webfont.woff2diffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/roboto-regular-webfont.woffdiffbeforeafterboth

binary blob — no preview

addedmochawesome-report/assets/roboto-regular-webfont.woff2diffbeforeafterboth

binary blob — no preview

addedmochawesome-report/mochawesome.htmldiffbeforeafterboth

no changes

addedmochawesome-report/mochawesome.jsondiffbeforeafterboth

no changes

deletedrococo-local-raw.jsondiffbeforeafterboth

no changes

deletedrococo-local.jsondiffbeforeafterboth

no changes

deletedrococo-local111.jsondiffbeforeafterboth

no changes