difftreelog
small fixes
in: master
3 files changed
Dockerfile-testsdiffbeforeafterboth--- a/Dockerfile-tests
+++ b/Dockerfile-tests
@@ -1,10 +1,10 @@
# ===== Integration Tests ======
-FROM ubuntu:18.04
+FROM ubuntu:20.04
LABEL maintainer="UniqueNetwork.io"
-RUN apt-get -y update; apt-get -y upgrade; apt-get -y install curl
+RUN apt -y update; apt -y upgrade; apt -y install curl
RUN mkdir nft_parachain
@@ -18,11 +18,13 @@
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash && \
export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
- nvm install v15.0.1 && \
- nvm use v15.0.1 && \
+ nvm install v15.5.0 && \
+ nvm use v15.5.0 && \
npm install --save @polkadot/api && \
npm install --save-dev mochawesome
+RUN sleep 60
+
CMD export NVM_DIR="$HOME/.nvm" && \
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
cd tests && \
docker-compose-tests-parachain.ymldiffbeforeafterboth1version: "3.5"23services:4 node_validator1:5 image: nft_node_test6 container_name: validator1_test7 ports:8 - 9944:99449 build:10 context: ./11 dockerfile: Dockerfile-parachain12 volumes:13# - ./chain-data:/chain-data14 - ./launch-config.json:/polkadot-launch/launch-config.json15 - ./runtime_types.json:/polkadot-launch/runtime_types.json16 networks:17 - node_test_network18 #command: bash -c "yarn --cwd polkadot-launch start"19 #command: bash -c 'while true; do sleep 60; df -h; done'2021 integration_tests:22 container_name: integration_test23 image: int_test24 build:25 context: ./26 dockerfile: Dockerfile-tests27 volumes:28 - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts29 - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report30 # command: bash -c 'while true; do sleep 20; df -h; done'31 networks:32 - node_test_network33 depends_on:34 - node_validator13536# unit_tests:37# container_name: unit_test38# image: nft_unit_test39# build:40# context: ./41# dockerfile: Dockerfile-unit42# container_name: unit_test43# networks:44# - node_test_network45 # command: bash -c 'while true; do sleep 20; df -h; done'46# command: bash -c 'cargo test'4748networks:49 node_test_network:50 name: node_test_network51 driver: bridge1version: "3.5"23services:4 node_validator1:5 image: nft_node_test6 container_name: validator1_test7 ports:8 - 9944:99449 - 9844:984410 build:11 context: ./12 dockerfile: Dockerfile-parachain13 volumes:14# - ./chain-data:/chain-data15 - ./launch-config.json:/polkadot-launch/launch-config.json16 - ./runtime_types.json:/polkadot-launch/runtime_types.json17 networks:18 - node_test_network19 #command: bash -c "yarn --cwd polkadot-launch start"20 #command: bash -c 'while true; do sleep 60; df -h; done'2122 integration_tests:23 container_name: integration_test24 image: int_test25 build:26 context: ./27 dockerfile: Dockerfile-tests28 volumes:29 - ./tests/src/config_docker.ts:/nft_parachain/tests/src/config.ts30 - /home/polkadot/mochawesome-report:/nft_parachain/tests/mochawesome-report31 # command: bash -c 'while true; do sleep 20; df -h; done'32 networks:33 - node_test_network34 depends_on:35 - node_validator13637# unit_tests:38# container_name: unit_test39# image: nft_unit_test40# build:41# context: ./42# dockerfile: Dockerfile-unit43# container_name: unit_test44# networks:45# - node_test_network46 # command: bash -c 'while true; do sleep 20; df -h; done'47# command: bash -c 'cargo test'4849networks:50 node_test_network:51 name: node_test_network52 driver: bridgetests/src/config_docker.tsdiffbeforeafterboth--- a/tests/src/config_docker.ts
+++ b/tests/src/config_docker.ts
@@ -7,6 +7,7 @@
const config = {
substrateUrl: process.env.substrateUrl || 'ws://172.17.0.1:9944',
+ frontierUrl: process.env.frontierUrl || 'http://172.17.0.1:9933',
};
-export default config;
\ No newline at end of file
+export default config;