From bce3615e12609aa178a4741d2b942f89cd0e051b Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 11:26:18 +0400
Subject: [PATCH 1/7] update ref to nightly-2021-02-20

---
 README.md                        | 2 +-
 node/README.md                   | 4 ++--
 scripts/raspberry-cross-build.sh | 2 +-
 scripts/run-dev-chain.sh         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f6c7098a5c..db075918f1 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ You can also run your our own joystream-node:
 
 ```sh
 git checkout master
-WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo build --release
+WASM_BUILD_TOOLCHAIN=nightly-2021-02-20 cargo build --release
 ./target/release/joystream-node -- --pruning archive --chain testnets/joy-testnet-4.json
 ```
 
diff --git a/node/README.md b/node/README.md
index f50ba06010..be9271a833 100644
--- a/node/README.md
+++ b/node/README.md
@@ -26,7 +26,7 @@ cd joystream/
 Compile the node and runtime:
 
 ```bash
-WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo build --release
+WASM_BUILD_TOOLCHAIN=nightly-2021-02-20 cargo build --release
 ```
 
 This produces the binary in `./target/release/joystream-node`
@@ -79,7 +79,7 @@ If you are building a tagged release from `master` branch and want to install th
 This will install the executable `joystream-node` to your `~/.cargo/bin` folder, which you would normally have in your `$PATH` environment.
 
 ```bash
-WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 cargo install joystream-node --path node/ --locked
+WASM_BUILD_TOOLCHAIN=nightly-2021-02-20 cargo install joystream-node --path node/ --locked
 ```
 
 Now you can run and connect to the testnet:
diff --git a/scripts/raspberry-cross-build.sh b/scripts/raspberry-cross-build.sh
index c6d6d22260..133216e4ac 100755
--- a/scripts/raspberry-cross-build.sh
+++ b/scripts/raspberry-cross-build.sh
@@ -9,7 +9,7 @@
 export WORKSPACE_ROOT=`cargo metadata --offline --no-deps --format-version 1 | jq .workspace_root -r`
 
 docker run \
-    -e WASM_BUILD_TOOLCHAIN=nightly-2020-05-23 \
+    -e WASM_BUILD_TOOLCHAIN=nightly-2021-02-20 \
     --volume ${WORKSPACE_ROOT}/:/home/cross/project \
     --volume ${HOME}/.cargo/registry:/home/cross/.cargo/registry \
     joystream/rust-raspberry \
diff --git a/scripts/run-dev-chain.sh b/scripts/run-dev-chain.sh
index 8e21c13b1c..ef7495d83f 100755
--- a/scripts/run-dev-chain.sh
+++ b/scripts/run-dev-chain.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-export WASM_BUILD_TOOLCHAIN=nightly-2020-05-23
+export WASM_BUILD_TOOLCHAIN=nightly-2021-02-20
 
 # Build release binary
 cargo build --release

From a9411d09e8253daac4ab5686e516713cd4e64dc8 Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 11:38:41 +0400
Subject: [PATCH 2/7] typo in script

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index eeae813f49..64d82b099c 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ if ! command -v docker-compose &> /dev/null
     # Fetch a cached joystream/node image if one is found matching code shasum instead of building
     CODE_HASH=`scripts/runtime-code-shasum.sh`
     IMAGE=joystream/node:${CODE_HASH}
-    echo "Trying to fetch cashed ${IMAGE} image"
+    echo "Trying to fetch cached ${IMAGE} image"
     docker pull ${IMAGE} || :
 
     if ! docker inspect ${IMAGE} > /dev/null;

From 122b09371e5e97116318f067c15a9fbeaaa977e6 Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 11:41:11 +0400
Subject: [PATCH 3/7] revert change to example for ApiPromise in
 types/README.md

---
 types/README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/types/README.md b/types/README.md
index 44c6526828..12794ffe0f 100644
--- a/types/README.md
+++ b/types/README.md
@@ -26,9 +26,7 @@ async function main() {
   const provider = new WsProvider('ws://127.0.0.1:9944')
 
   // Create the API and wait until ready
-  const api = new ApiPromise({ provider, types })
-
-  await api.isReady
+  const api = await ApiPromise.create({ provider, types })
 
   // Retrieve the chain & node information information via rpc calls
   const [chain, nodeName, nodeVersion] = await Promise.all([

From 855b8ab75d6ab8fec31bb8bf3a90c3540cf4b56f Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 15:17:54 +0400
Subject: [PATCH 4/7] separate building of npm packages, docker images and
 cargo crates

---
 .dockerignore                                 |  2 +
 .../workflows/content-directory-schemas.yml   |  3 ++
 .github/workflows/joystream-cli.yml           |  6 +++
 .github/workflows/joystream-types.yml         |  4 ++
 .github/workflows/network-tests.yml           |  4 ++
 .github/workflows/pioneer.yml                 |  4 ++
 .github/workflows/run-network-tests.yml       | 28 ++++++++++----
 .github/workflows/storage-node.yml            |  4 ++
 README.md                                     | 10 ++---
 apps.Dockerfile                               | 24 ++++++++++--
 build-docker-images.sh                        | 37 +++++++++++++++++++
 build-npm-packages.sh                         | 12 ++++++
 docker-compose.yml                            |  7 ++--
 package.json                                  |  6 ++-
 pioneer.Dockerfile                            | 18 +++++++++
 pioneer/README.md                             |  2 +-
 start.sh                                      |  9 +++--
 17 files changed, 155 insertions(+), 25 deletions(-)
 create mode 100755 build-docker-images.sh
 create mode 100755 build-npm-packages.sh
 create mode 100644 pioneer.Dockerfile

diff --git a/.dockerignore b/.dockerignore
index d645d23dc4..ca7ee568ff 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,3 +5,5 @@ target/
 query-node/generated
 query-node/**/dist
 query-node/lib
+cli/
+tests/
\ No newline at end of file
diff --git a/.github/workflows/content-directory-schemas.yml b/.github/workflows/content-directory-schemas.yml
index ed56cffa5e..2b3ba85cc2 100644
--- a/.github/workflows/content-directory-schemas.yml
+++ b/.github/workflows/content-directory-schemas.yml
@@ -17,4 +17,7 @@ jobs:
     - name: validate
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build
         yarn workspace @joystream/cd-schemas checks --quiet
diff --git a/.github/workflows/joystream-cli.yml b/.github/workflows/joystream-cli.yml
index 03200c2a71..8ee74430b7 100644
--- a/.github/workflows/joystream-cli.yml
+++ b/.github/workflows/joystream-cli.yml
@@ -17,6 +17,9 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build
         yarn workspace @joystream/cli checks --quiet
     - name: yarn pack test
       run: |
@@ -39,6 +42,9 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build        
         yarn workspace @joystream/cli checks --quiet
     - name: yarn pack test
       run: |
diff --git a/.github/workflows/joystream-types.yml b/.github/workflows/joystream-types.yml
index 8b48f645eb..efade394a9 100644
--- a/.github/workflows/joystream-types.yml
+++ b/.github/workflows/joystream-types.yml
@@ -17,6 +17,7 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
         yarn workspace @joystream/types checks --quiet
     - name: npm pack test
       run: |
@@ -40,6 +41,9 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build
         yarn workspace @joystream/types checks --quiet
     - name: npm pack test
       run: |
diff --git a/.github/workflows/network-tests.yml b/.github/workflows/network-tests.yml
index 2773784a02..240ec1cddd 100644
--- a/.github/workflows/network-tests.yml
+++ b/.github/workflows/network-tests.yml
@@ -17,6 +17,10 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build
+        yarn workspace @joystream/cli build
         yarn workspace network-tests checks --quiet
 
   network_build_osx:
diff --git a/.github/workflows/pioneer.yml b/.github/workflows/pioneer.yml
index ab4a40bf77..e904d44f9d 100644
--- a/.github/workflows/pioneer.yml
+++ b/.github/workflows/pioneer.yml
@@ -17,6 +17,7 @@ jobs:
     - name: build
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
         yarn workspace pioneer build
 
   pioneer_build_osx:
@@ -34,6 +35,7 @@ jobs:
     - name: build
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
         yarn workspace pioneer build
 
   pioneer_lint_ubuntu:
@@ -51,6 +53,7 @@ jobs:
     - name: lint
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
         yarn workspace pioneer lint --quiet
 
   pioneer_lint_osx:
@@ -68,4 +71,5 @@ jobs:
     - name: lint
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
         yarn workspace pioneer lint --quiet
diff --git a/.github/workflows/run-network-tests.yml b/.github/workflows/run-network-tests.yml
index 3ff1cb3bad..d9ba8ecb84 100644
--- a/.github/workflows/run-network-tests.yml
+++ b/.github/workflows/run-network-tests.yml
@@ -97,7 +97,9 @@ jobs:
           docker load --input joystream-node-docker-image.tar.gz
           docker images
       - name: Install packages and dependencies
-        run: yarn install --frozen-lockfile
+        run: |
+          yarn install --frozen-lockfile
+          yarn build:packages
       - name: Ensure tests are runnable
         run: yarn workspace network-tests build
       - name: Execute network tests
@@ -121,7 +123,9 @@ jobs:
           docker load --input joystream-node-docker-image.tar.gz
           docker images
       - name: Install packages and dependencies
-        run: yarn install --frozen-lockfile
+        run: |
+          yarn install --frozen-lockfile
+          yarn build:packages
       - name: Ensure tests are runnable
         run: yarn workspace network-tests build
       - name: Execute network tests
@@ -145,7 +149,11 @@ jobs:
           docker load --input joystream-node-docker-image.tar.gz
           docker images
       - name: Install packages and dependencies
-        run: yarn install --frozen-lockfile
+        run: |
+          yarn install --frozen-lockfile
+          yarn workspace @joystream/types build
+          yarn workspace @joystream/cd-schemas generate:all
+          yarn workspace @joystream/cd-schemas build
       - name: Ensure tests are runnable
         run: yarn workspace @joystream/cd-schemas checks --quiet
       - name: Start chain
@@ -171,9 +179,13 @@ jobs:
           docker load --input joystream-node-docker-image.tar.gz
           docker images
       - name: Install packages and dependencies
-        run: yarn install --frozen-lockfile
-      - name: Ensure query-node builds
-        run: yarn workspace query-node-root build
+        run: |
+          yarn install --frozen-lockfile
+          yarn workspace @joystream/types build
+          yarn workspace @joystream/cd-schemas generate:all
+          yarn workspace @joystream/cd-schemas build
+          yarn workspace query-node-root build
+          yarn workspace @joystream/cli build
       - name: Ensure tests are runnable
         run: yarn workspace network-tests build
       # Bring up hydra query-node development instance, then run content directory
@@ -199,7 +211,9 @@ jobs:
           docker load --input joystream-node-docker-image.tar.gz
           docker images
       - name: Install packages and dependencies
-        run: yarn install --frozen-lockfile
+        run: |
+          yarn install --frozen-lockfile
+          yarn workspace @joystream/types build
       - name: Build storage node
         run: yarn workspace storage-node build
       - name: Start Services
diff --git a/.github/workflows/storage-node.yml b/.github/workflows/storage-node.yml
index 0745ce3a7d..71cf63a8af 100644
--- a/.github/workflows/storage-node.yml
+++ b/.github/workflows/storage-node.yml
@@ -17,7 +17,9 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile
+        yarn workspace @joystream/types build
         yarn workspace storage-node checks --quiet
+        yarn workspace storage-node build
 
   storage_node_build_osx:
     name: MacOS Checks
@@ -34,4 +36,6 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
         yarn workspace storage-node checks --quiet
+        yarn workspace storage-node build
\ No newline at end of file
diff --git a/README.md b/README.md
index db075918f1..9107e2327e 100644
--- a/README.md
+++ b/README.md
@@ -25,12 +25,11 @@ After cloning the repo run the following initialization scripts:
 # Install rust toolchain
 ./setup.sh
 
-# Install npm package dependencies
-# Also good habit to run this when switching between branches
-yarn install
+# Install npm package dependencies, build packages and docker images
+yarn build
 
-# run some tests
-yarn cargo-checks
+# start a local development network
+yarn start
 ```
 
 ## Software
@@ -75,6 +74,7 @@ The HEAD of the master branch should always be used for the correct version of t
 ```sh
 git checkout master
 yarn install
+yarn build:packages
 yarn workspace pioneer start
 ```
 
diff --git a/apps.Dockerfile b/apps.Dockerfile
index 74691e8f6e..60aa818b37 100644
--- a/apps.Dockerfile
+++ b/apps.Dockerfile
@@ -2,13 +2,31 @@ FROM node:12 as builder
 
 WORKDIR /joystream
 COPY . /joystream
+RUN  rm -fr /joystream/pioneer
 
 # Do not set NODE_ENV=production until after running yarn install
 # to ensure dev dependencies are installed.
-RUN yarn install --frozen-lockfile
+RUN yarn --forzen-lockfile
 
-RUN yarn workspace pioneer build
-RUN yarn workspace storage-node build
+RUN yarn workspace @joystream/types build
 RUN yarn workspace query-node-root build
+RUN yarn workspace storage-node build
+
+# Second stage to reduce image size, enable it when
+# all packages have correctly identified what is a devDependency and what is not.
+# It will reduce the image size by about 500MB (down from 2.2GB to 1.7GB)
+
+# # Remove files that are not needed after build.
+# # We will re-fetch only dependencies needed for running the apps.
+# RUN rm -fr node_modules/
+# RUN rm -fr .git/
+
+# FROM node:12
+# WORKDIR /joystream
+# COPY --from=builder /joystream/ /joystream/
+
+# # Skip installing devDependencies, since we have already built the packages.
+# ENV NODE_ENV=production
+# RUN yarn install --forzen-lockfile --production
 
 ENTRYPOINT [ "yarn" ]
diff --git a/build-docker-images.sh b/build-docker-images.sh
new file mode 100755
index 0000000000..c2ca905bc8
--- /dev/null
+++ b/build-docker-images.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+set -e
+
+if ! command -v docker-compose &> /dev/null
+then
+  echo "docker-compose not found. Skipping docker image builds."
+  exit 0
+fi
+
+# Build or fetch cached joystream/node docker image
+if [[ "$SKIP_JOYSTREAM_NODE" = 1 || "$SKIP_JOYSTREAM_NODE" = "true" ]]; then
+  echo "Skipping build of joystream/node docker image."
+else
+  # Fetch a cached joystream/node image if one is found matching code shasum instead of building
+  CODE_HASH=`scripts/runtime-code-shasum.sh`
+  IMAGE=joystream/node:${CODE_HASH}
+  echo "Trying to fetch cashed ${IMAGE} image"
+  docker pull ${IMAGE} || :
+
+  if ! docker inspect ${IMAGE} > /dev/null;
+  then
+    echo "Fetch failed, building image locally"
+    docker-compose build joystream-node
+  else
+    echo "Tagging cached image as 'latest'"
+    docker image tag ${IMAGE} joystream/node:latest
+  fi
+fi
+
+# Build joystream/apps docker image
+echo "Building 'joystream/apps' docker image..."
+docker-compose build colossus
+
+# Build the pioneer docker image
+echo "Building pioneer docker image"
+docker-compose build pioneer
\ No newline at end of file
diff --git a/build-npm-packages.sh b/build-npm-packages.sh
new file mode 100755
index 0000000000..c067a2f2a6
--- /dev/null
+++ b/build-npm-packages.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -e
+
+yarn
+yarn workspace @joystream/types build
+yarn workspace @joystream/cd-schemas generate:all
+yarn workspace @joystream/cd-schemas build
+yarn workspace query-node-root build
+yarn workspace @joystream/cli build
+yarn workspace storage-node build
+yarn workspace pioneer build
diff --git a/docker-compose.yml b/docker-compose.yml
index 841fd53735..aae94268aa 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,10 +151,9 @@ services:
       - "127.0.0.1:6379:6379"
 
   pioneer:
-    image: joystream/apps
+    image: joystream/pioneer
     build:
       context: .
-      dockerfile: apps.Dockerfile
+      dockerfile: pioneer.Dockerfile
     ports:
-      - "127.0.0.1:3000:3000"
-    command: workspace pioneer start
+      - "127.0.0.1:3000:80"
diff --git a/package.json b/package.json
index ceaf2aee23..203b9d0f79 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,10 @@
   "version": "1.0.0",
   "license": "GPL-3.0-only",
   "scripts": {
-    "postinstall": "yarn workspace @joystream/types build && yarn workspace @joystream/cd-schemas generate:all && yarn workspace @joystream/cd-schemas build && yarn workspace @joystream/cli build",
-    "build": "./build.sh",
+    "build": "./build-npm-packages.sh && ./build-docker-images.sh",
+    "build:packages": "./build-npm-packages.sh",
+    "build:docker": "./build-docker-images.sh",
+    "setup": "./setup.sh",
     "start": "./start.sh",
     "cargo-checks": "devops/git-hooks/pre-commit && devops/git-hooks/pre-push",
     "cargo-build": "scripts/cargo-build.sh"
diff --git a/pioneer.Dockerfile b/pioneer.Dockerfile
new file mode 100644
index 0000000000..ac07219fcc
--- /dev/null
+++ b/pioneer.Dockerfile
@@ -0,0 +1,18 @@
+FROM node:12 as builder
+
+WORKDIR /joystream
+COPY . /joystream
+
+RUN yarn
+RUN NODE_ENV=production yarn workspace @joystream/types build
+RUN NODE_ENV=production yarn workspace pioneer build
+
+FROM ubuntu:18.04
+
+RUN apt-get update && apt-get -y install nginx
+
+COPY --from=builder /joystream/pioneer/packages/apps/build /var/www/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/pioneer/README.md b/pioneer/README.md
index b1640de317..c78511d970 100644
--- a/pioneer/README.md
+++ b/pioneer/README.md
@@ -37,7 +37,7 @@ To start off, this repo (along with others in the [@polkadot](https://github.com
 
 To get started -
 
-1. Clone the repo locally, via `git clone https://github.com/joystream/apps <optional local path>`
+1. Clone the repo locally, via `git clone https://github.com/joystream/joystream <optional local path>`
 2. Ensure that you have a recent LTS version of Node.js, for development purposes [Node >=10.13.0](https://nodejs.org/en/) is recommended.
 3. Ensure that you have a recent version of Yarn, for development purposes [Yarn >=1.10.1](https://yarnpkg.com/docs/install) is required.
 4. Install the dependencies by running `yarn`
diff --git a/start.sh b/start.sh
index fb2f4144e3..d530d97b67 100755
--- a/start.sh
+++ b/start.sh
@@ -38,7 +38,10 @@ yarn workspace query-node-root db:migrate
 docker-compose up -d graphql-server
 docker-compose up -d processor
 
-echo "press Ctrl+C to shutdown"
+docker-compose up -d pioneer
 
-# Start a dev instance of pioneer and wait for exit
-docker-compose up pioneer
+echo "use Ctrl+C to shutdown the development network."
+
+while true; do 
+  read
+done

From 8732afe6db686f3d02da1e6d3e04bd79b8157912 Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 15:41:28 +0400
Subject: [PATCH 5/7] drop old build.sh and re-fix typo

---
 build-docker-images.sh |  2 +-
 build.sh               | 50 ------------------------------------------
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100755 build.sh

diff --git a/build-docker-images.sh b/build-docker-images.sh
index c2ca905bc8..17702a84ef 100755
--- a/build-docker-images.sh
+++ b/build-docker-images.sh
@@ -15,7 +15,7 @@ else
   # Fetch a cached joystream/node image if one is found matching code shasum instead of building
   CODE_HASH=`scripts/runtime-code-shasum.sh`
   IMAGE=joystream/node:${CODE_HASH}
-  echo "Trying to fetch cashed ${IMAGE} image"
+  echo "Trying to fetch cached ${IMAGE} image"
   docker pull ${IMAGE} || :
 
   if ! docker inspect ${IMAGE} > /dev/null;
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 64d82b099c..0000000000
--- a/build.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-yarn
-yarn workspace @joystream/types build
-yarn workspace @joystream/cd-schemas generate:all
-yarn workspace @joystream/cd-schemas build
-yarn workspace @joystream/cli build
-yarn workspace query-node-root build
-yarn workspace storage-node build
-# Not strictly needed during development, we run "yarn workspace pioneer start" to start
-# a dev instance, but will show highlight build issues
-yarn workspace pioneer build
-
-if ! command -v docker-compose &> /dev/null
-  # Build or fetch cached joystream/node docker image
-  if [[ "$SKIP_JOYSTREAM_NODE" = 1 || "$SKIP_JOYSTREAM_NODE" = "true" ]]; then
-    echo "Skipping build of joystream/node docker image."
-  else
-    # Fetch a cached joystream/node image if one is found matching code shasum instead of building
-    CODE_HASH=`scripts/runtime-code-shasum.sh`
-    IMAGE=joystream/node:${CODE_HASH}
-    echo "Trying to fetch cached ${IMAGE} image"
-    docker pull ${IMAGE} || :
-
-    if ! docker inspect ${IMAGE} > /dev/null;
-    then
-      echo "Fetch failed, building image locally"
-      docker-compose build joystream-node
-    else
-      echo "Tagging cached image as 'latest'"
-      docker image tag ${IMAGE} joystream/node:latest
-    fi
-  fi
-
-  # Build joystream/apps docker image
-  echo "Building 'joystream/apps' docker image..."
-  docker-compose build colossus
-then
-  echo "docker-compose not found. Skipping docker image builds."
-fi
-
-# Build cargo crates: native binaries joystream/node, wasm runtime, and chainspec builder.
-if [[ "$SKIP_JOYSTREAM_NODE" = 1 || "$SKIP_JOYSTREAM_NODE" = "true" ]]; then
-  echo "Skipping cargo build"
-else
-  yarn cargo-checks
-  yarn cargo-build
-fi

From f91e37d9de266ec4df10054b97634a8031331394 Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 17:15:41 +0400
Subject: [PATCH 6/7] github actions add missing build step for network-tests
 job

---
 .github/workflows/network-tests.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/network-tests.yml b/.github/workflows/network-tests.yml
index 240ec1cddd..bffee4395b 100644
--- a/.github/workflows/network-tests.yml
+++ b/.github/workflows/network-tests.yml
@@ -38,4 +38,8 @@ jobs:
     - name: checks
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
+        yarn workspace @joystream/types build
+        yarn workspace @joystream/cd-schemas generate:all
+        yarn workspace @joystream/cd-schemas build
+        yarn workspace @joystream/cli build
         yarn workspace network-tests checks --quiet

From d9d6762b817b9d1e8c4867bbaa7379499dfcf9c6 Mon Sep 17 00:00:00 2001
From: Mokhtar Naamani <mokhtar.naamani@gmail.com>
Date: Tue, 30 Mar 2021 21:06:35 +0400
Subject: [PATCH 7/7] github workflows: don't build cli where its not required

---
 .github/workflows/joystream-types.yml   | 2 --
 .github/workflows/network-tests.yml     | 2 --
 .github/workflows/run-network-tests.yml | 1 -
 3 files changed, 5 deletions(-)

diff --git a/.github/workflows/joystream-types.yml b/.github/workflows/joystream-types.yml
index efade394a9..11d23338b5 100644
--- a/.github/workflows/joystream-types.yml
+++ b/.github/workflows/joystream-types.yml
@@ -42,8 +42,6 @@ jobs:
       run: |
         yarn install --frozen-lockfile --network-timeout 120000
         yarn workspace @joystream/types build
-        yarn workspace @joystream/cd-schemas generate:all
-        yarn workspace @joystream/cd-schemas build
         yarn workspace @joystream/types checks --quiet
     - name: npm pack test
       run: |
diff --git a/.github/workflows/network-tests.yml b/.github/workflows/network-tests.yml
index bffee4395b..bfe47930aa 100644
--- a/.github/workflows/network-tests.yml
+++ b/.github/workflows/network-tests.yml
@@ -20,7 +20,6 @@ jobs:
         yarn workspace @joystream/types build
         yarn workspace @joystream/cd-schemas generate:all
         yarn workspace @joystream/cd-schemas build
-        yarn workspace @joystream/cli build
         yarn workspace network-tests checks --quiet
 
   network_build_osx:
@@ -41,5 +40,4 @@ jobs:
         yarn workspace @joystream/types build
         yarn workspace @joystream/cd-schemas generate:all
         yarn workspace @joystream/cd-schemas build
-        yarn workspace @joystream/cli build
         yarn workspace network-tests checks --quiet
diff --git a/.github/workflows/run-network-tests.yml b/.github/workflows/run-network-tests.yml
index d9ba8ecb84..dd24733740 100644
--- a/.github/workflows/run-network-tests.yml
+++ b/.github/workflows/run-network-tests.yml
@@ -185,7 +185,6 @@ jobs:
           yarn workspace @joystream/cd-schemas generate:all
           yarn workspace @joystream/cd-schemas build
           yarn workspace query-node-root build
-          yarn workspace @joystream/cli build
       - name: Ensure tests are runnable
         run: yarn workspace network-tests build
       # Bring up hydra query-node development instance, then run content directory