Bläddra i källkod

update README and build steps to not require running joystream-node

Mokhtar Naamani 3 år sedan
förälder
incheckning
d9286bae61
5 ändrade filer med 6 tillägg och 49 borttagningar
  1. 2 12
      README.md
  2. 2 18
      build-apps-docker.sh
  3. 1 4
      build-npm-packages.sh
  4. 1 1
      distributor-node.Dockerfile
  5. 0 14
      docker-compose.linux-gnu-build.yml

+ 2 - 12
README.md

@@ -25,8 +25,8 @@ After cloning the repo run the following initialization scripts:
 # Install rust toolchain
 ./setup.sh
 
-# Install npm dependencies
-yarn
+# build local npm packages
+yarn build:packages
 
 # Build joystream/node image
 yarn build:node:docker
@@ -34,16 +34,6 @@ yarn build:node:docker
 # Build applications docker image
 yarn build:apps:docker
 
-# start local dev joystream/node (required when building query-node package)
-# or optionally build native binary and run dev chain with ./script/run-dev-chain.sh
-docker-compose up -d joystream/node
-
-# build local npm packages
-yarn build:packages
-
-# stop dev joystream/node container
-docker-compose down -v
-
 # start a local development network
 yarn start
 ```

+ 2 - 18
build-apps-docker.sh

@@ -8,24 +8,8 @@ then
   exit 0
 fi
 
-if [[ "$OSTYPE" == "linux-gnu" ]]; then
-    IP_ADDRESS=$(ip addr show | grep "\binet\b.*\bdocker0\b" | awk '{print $2}' | cut -d '/' -f 1)
-    # Run a local development chain
-    docker-compose -f docker-compose.linux-gnu-build.yml up -d joystream-node
-
-    # Build processor/graphql-server docker image
-    echo "Building joystream/apps docker image..."
-    WS_PROVIDER_ENDPOINT_URI=ws://${IP_ADDRESS}:9944/ docker-compose build graphql-server
-    docker-compose down
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    # Run a local development chain
-    docker-compose up -d joystream-node
-
-    # Build processor/graphql-server docker image
-    echo "Building joystream/apps docker image..."
-    WS_PROVIDER_ENDPOINT_URI=ws://host.docker.internal:9944/ docker-compose build graphql-server
-    docker-compose down
-fi
+# Build processor/graphql-server docker image
+docker-compose build graphql-server
 
 # Build colossus docker image
 echo "Building colossus docker image..."

+ 1 - 4
build-npm-packages.sh

@@ -2,12 +2,9 @@
 
 set -e
 
-yarn
+yarn --frozen-lockfile
 yarn workspace @joystream/types build
 yarn workspace @joystream/metadata-protobuf build
-# A joystream-node is expected to be running locally for query-node build to work
-# either start a container with: docker-compose up -d joystream-node
-# or run native binary with: ./scripts/run-dev-chain.sh
 yarn workspace query-node-root build
 yarn workspace @joystream/cli build
 yarn workspace storage-node-v2 build

+ 1 - 1
distributor-node.Dockerfile

@@ -6,7 +6,7 @@ COPY ./metadata-protobuf metadata-protobuf
 COPY ./distributor-node distributor-node
 COPY ./yarn.lock yarn.lock
 COPY ./package.json package.json
-
+COPY ./chain-metadata.json chain-metadata.json
 EXPOSE 3334
 
 # Build & cleanup

+ 0 - 14
docker-compose.linux-gnu-build.yml

@@ -1,14 +0,0 @@
-version: '3.4'
-services:
-  joystream-node:
-    image: joystream/node:latest
-    build:
-      # context is relative to the compose file
-      context: .
-      # dockerfile is relative to the context
-      dockerfile: joystream-node.Dockerfile
-    container_name: joystream-node
-    volumes:
-      - /data
-    command: --dev --alice --validator --unsafe-ws-external --unsafe-rpc-external --rpc-methods Unsafe --rpc-cors=all --log runtime --base-path /data
-    network_mode: host