replace yaml-merge with yq, fix quickstart deployment docs. Closes #1780 (#1782)

* replace yaml-merge with yq, fix quickstart deployment docs. Closes #1780

* WIP- rephrase production-docker-compose.yml creation sentence

* Minor changes to quickstart docs, docker-compose, deploy-deepforge

1. Revert to docker-compose.yml with ${TOKEN_KEYS_DIR} mount
2. Remove NODE_ENV=default from docker-compose.yml and fix key removal
3. Change documentation quickstart with docker using docker-compose run

* WIP- remove NODE_ENV=production quickstrat docs

* WIP remove -e from docker quickstart tutorial

Author: umesh-timalsina

.deployment/deploy-deepforge

@@ -17,7 +17,7 @@ fi;
 rm config/components2.json
 
 # Merging the custom override yml file
-yaml-merge docker/docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overrides.yml > custom-docker-compose.yml
+yq m -a docker/docker-compose.yml "$DEEPFORGE_DEPLOYMENT_DIR"/docker-compose-overrides.yml > custom-docker-compose.yml
 
 # Pulling the latest docker image, stopping the server, removing and restarting it
 docker-compose --file custom-docker-compose.yml -p deepforge pull $SERVER_NAME

.deployment/docker-compose-overrides.yml

@@ -5,8 +5,6 @@ services:
       - "DEEPFORGE_HOST=https://dev.deepforge.org"
       - "DEEPFORGE_INTERACTIVE_COMPUTE_HOST=https://dev-compute.deepforge.org"
     volumes:
-      - "$HOME/.deepforge/blob:/data/blob"
-      - "${TOKEN_KEYS_DIR}:/token_keys"
       - "${DEEPFORGE_DEPLOYMENT_DIR}:/.deployment"
       - "${DEEPFORGE_DEPLOYMENT_DIR}/../config/components.json:/deepforge/config/components.json"
 

docs/deployment/quick_start.rst

@@ -12,23 +12,11 @@ Next, you must decide if you would like authentication to be enabled. For produc
 
 Without User Accounts
 ---------------------
-Open the docker-compose file and add the following environment variable to the server:
+Start the docker containers with ``docker-compose run`` :
 
 .. code-block:: bash
 
-    NODE_ENV=default
-
-and delete the volume for the server's keys (used for signing JWTs):
-
-.. code-block:: bash
-
-    - "${TOKEN_KEYS_DIR}:/token_keys"
-
-Next, start the docker containers with
-
-.. code-block:: bash
-
-    docker-compose up
+    docker-compose --file docker-compose.yml run -p 8888:8888 -p 8889:8889 -e "NODE_ENV=default" server
 
 User Authentication Enabled
 ---------------------------
@@ -41,11 +29,11 @@ First, generate a public and private key pair
     openssl rsa -in deepforge_keys/private_key -pubout > deepforge_keys/public_key
     export TOKEN_KEYS_DIR="$(pwd)/deepforge_keys"
 
-Then start DeepForge using docker-compose:
+Then start DeepForge using ``docker-compose run``:
 
 .. code-block:: bash
 
-    docker-compose up
+    docker-compose --file docker-compose.yml run -v "${TOKEN_KEYS_DIR}:/token_keys" -p  8888:8888 -p 8889:8889 server
 
 Finally, create the admin user by connecting to the server's docker container. First, get the ID of the container using: