Merge branch 'main' into dependabot/npm_and_yarn/demo/semver-5.7.2

.github/workflows/demo-prod.yml

@@ -1,3 +1,4 @@
+# Disabled because we deleted the Azure resources.
 name: "Demo: Deploy Prod"
 
 on:

.github/workflows/demo-test.yml

@@ -26,6 +26,7 @@ jobs:
       - name: Build
         run: |
           pushd demo
+          # We no longer push Docker images because we deleted some Azure resources, so mcr.microsoft.com might stop working.
           docker pull mcr.microsoft.com/samples/blockchain-ai/0xdeca10b-demo:latest
           docker build -f Dockerfile \
             --cache-from mcr.microsoft.com/samples/blockchain-ai/0xdeca10b-demo:latest \

.github/workflows/docker.yml

@@ -1,3 +1,4 @@
+# Disabled because we deleted the Azure resources.
 name: "Push Docker Images"
 
 on:

demo/README.md

@@ -45,10 +45,21 @@ conda activate python2
 cd 0xDeCA10B/demo
 ```
 
+<!-- Probably won't work because we deleted some Azure resources.
 3. You can use a Docker image by running:
 ```bash
 docker run --rm -it -p 3000:3000 -p 5387:5387 -p 7545:7545 -v ${PWD}:/root/workspace/demo -v /root/workspace/demo/node_modules -v /root/workspace/demo/client/node_modules --name decai-demo mcr.microsoft.com/samples/blockchain-ai/0xdeca10b-demo bash
+-->
 
+3. ### Using a Docker Image
+```bash
+docker build -t decai-demo .
+
+docker run --rm -it -p 3000:3000 -p 5387:5387 -p 7545:7545 -v ${PWD}:/root/workspace/demo -v /root/workspace/demo/node_modules -v /root/workspace/demo/client/node_modules --name decai-demo decai-demo bash
+```
+
+In the container:
+```bash
 # If this is your first time setting up then run:
 ./setup_libs.sh
 
@@ -61,12 +72,8 @@ Next, refer to the Deploy steps lower down on this page.
 
 If you want to use a different version of the Docker image, then you can find the available tags for the Docker image [here](https://mcr.microsoft.com/v2/samples/blockchain-ai/0xdeca10b-demo/tags/list) and check the details for the latest tag [here](https://mcr.microsoft.com/v2/samples/blockchain-ai/0xdeca10b-demo/manifests/latest).
 
-### Building the Docker Image
-(Optional)
-If you want to build your own fresh image:
-```bash
-docker build -t decai-demo .
-```
+
+<!-- Won't work because we deleted some Azure resources.
 
 #### (Microsoft Devs) Updating the Public Image
 First get permission to push 0xdeca10bcontainerreg.azurecr.io.
@@ -88,6 +95,7 @@ To update dependencies after already setting up:
 ```bash
 ./setup.sh
 ```
+-->
 
 # Deploy
 There is a video example showing how to deploy <a href="https://aka.ms/0xDeCA10B-deploy" target="_blank">here</a>.

demo/client/yarn.lock

@@ -6601,9 +6601,9 @@ htmlparser2@^3.3.0:
     readable-stream "^3.1.1"
 
 http-cache-semantics@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"

simulation/README.md

@@ -44,20 +44,24 @@ pip install -e .
 cd 0xDeCA10B/simulation
 ```
 
+<!-- Probably won't work because we deleted some Azure resources.
 3. You can use a Docker image by running:
 ```bash
 docker run --rm -it -p 5006:5006 -v ${PWD}:/root/workspace/0xDeCA10B/simulation --name decai-simulation mcr.microsoft.com/samples/blockchain-ai/0xdeca10b-simulation bash
 ```
+-->
 
-4. You have completed the setup steps.
-Next, refer to the Running Simulations steps lower down on this page.
-
-### Building the Docker Image
-If you want to build your own fresh image:
+3. ### Using a Docker Image
 ```bash
 docker build -t decai-simulation .
+
+docker run --rm -it -p 5006:5006 -v ${PWD}:/root/workspace/0xDeCA10B/simulation --name decai-simulation decai-simulation bash
 ```
 
+4. You have completed the setup steps.
+Next, refer to the Running Simulations steps lower down on this page.
+
+<!-- Won't work because we deleted some Azure resources.
 #### (Microsoft Devs) Updating the Public Image
 First get permission to push 0xdeca10bcontainerreg.azurecr.io.
 
@@ -69,6 +73,7 @@ docker tag decai-simulation 0xdeca10bcontainerreg.azurecr.io/public/samples/bloc
 docker push 0xdeca10bcontainerreg.azurecr.io/public/samples/blockchain-ai/0xdeca10b-simulation:${newVersion}
 docker push 0xdeca10bcontainerreg.azurecr.io/public/samples/blockchain-ai/0xdeca10b-simulation:latest
 ```
+-->
 
 # Running Simulations
 Run: