Skip to content

Commit 803b64a

Browse files
committed
Merge branch 'master' into production
v0.20 re-release
2 parents 0a91473 + b35afb4 commit 803b64a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

docs/guides/developerGuide.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,20 +366,21 @@ branch and push the changes to github.
366366
build the production images and generate the user production .zip by running
367367
`bash release/generate_production_release.sh`. This will:
368368
369-
- Create local lab, machine, and dbmongo production docker images with the
369+
- Create lab, machine, and dbmongo production docker images with the
370370
tag defined in the .env file
371371
- Create the production .zip named `target/production/Aliro-${VERSION}.zip`
372+
- Build multi-architecture (amd64, arm64) docker images using `buildx bake` and push the images to docker hub.
372373
373374
```bash
374375
git checkout production
375376
bash release/generate_production_release.sh
376377
```
377378
378-
4. **Push docker images to DockerHub and tag the production git branch by
379+
4. **Check that the docker images were pushed to DockerHub and tag the production git branch by
379380
running `deploy_production_release.sh`.** While in the produciton branch, run
380381
`bash release/deploy_production_release.sh`. This will:
381382
382-
- Push the production lab, machine and dbmongo production docker images to dockerHub
383+
- Check that the production lab, machine and dbmongo production docker images exist in dockerHub
383384
- Tag the production git branch with the version defined in `.env`
384385
385386
```bash

lab/webapp/src/components/ChatGPT/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1811,6 +1811,10 @@ export default function ChatGPT({ experiment }) {
18111811

18121812
let resultMessage = resp["result"];
18131813

1814+
if (resp["status"] === "error") {
1815+
resultMessage = "Error: " + resultMessage;
1816+
}
1817+
18141818
// if resultMessage is undefined, resultMessage = "Undefined"
18151819
if (
18161820
resultMessage === undefined ||

0 commit comments

Comments
 (0)