git.delta.rocks / unique-network / refs/commits / 6ffe6c82e11d

difftreelog

Merge branch 'master' of https://github.com/usetech-llc/nft_parachain

str-mv2020-06-18parents: #3a27627 #07eae40.patch.diff
in: master

5 files changed

added.gitattributesdiffbeforeafterboth
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto
+*.sh text eol=lf
modifiedDockerfilediffbeforeafterboth
before · Dockerfile
1FROM rust:latest23EXPOSE 994445# Install build tools6RUN apt-get update && apt-get -y install -y cmake pkg-config libssl-dev git gcc build-essential clang libclang-dev curl7RUN curl https://getsubstrate.io -sSf | bash -s -- --fast8RUN rustup update nightly9RUN rustup target add wasm32-unknown-unknown --toolchain nightly10RUN rustup update1112# Get project and run it13RUN git clone https://github.com/usetech-llc/nft_parachain14WORKDIR /nft_parachain15RUN cargo build16RUN cargo test --all1718# Copy and run start script19COPY ["./run.sh", "./run.sh"]20RUN chmod +x ./run.sh21CMD ["bash", "-c", "./run.sh"]
modifieddoc/demo_milestone1-2.mddiffbeforeafterboth
--- a/doc/demo_milestone1-2.md
+++ b/doc/demo_milestone1-2.md
@@ -12,7 +12,7 @@
 
 The node can be run using docker container:
 ```
-TBD
+docker-compose up -d
 ```
 
 #### NFT Tracking Module
modifieddocker-compose.ymldiffbeforeafterboth
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "3.5"
 
 services:
   node:
@@ -10,3 +10,10 @@
       dockerfile: Dockerfile
     volumes:
       - ./chain-data:/chain-data
+    networks: 
+      - substrate_network
+
+networks: 
+  substrate_network:
+    driver: bridge
+    name: substrate_network
modifiedrun.shdiffbeforeafterboth
--- a/run.sh
+++ b/run.sh
@@ -1 +1,3 @@
-cargo run -- --dev --ws-external --rpc-external --base-path=./chain-data
\ No newline at end of file
+ls -la /nft_parachain/target/release
+
+/usr/local/bin/nft --dev --ws-external --rpc-external --base-path=/chain-data