Skip to content

Commit

Permalink
Merge pull request #1485 from Oneirocom/development
Browse files Browse the repository at this point in the history
dev to main
  • Loading branch information
coffeeorgreentea authored Jun 6, 2024
2 parents fbbc692 + 661b124 commit c9558e6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.1.0",
"license": "Apache 2.0",
"engines": {
"node": "18.x"
"node": "20.x"
},
"scripts": {
"agent-connector": "nx serve agent-connector",
Expand Down
2 changes: 2 additions & 0 deletions scripts/Dockerfile.server
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ RUN git submodule update --init --recursive portal/cloud

# RUN poetry install --no-root

RUN npm i -g nx

RUN npm install

RUN npm run build-server
Expand Down
6 changes: 5 additions & 1 deletion vercel-submodule-workaround.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,9 @@ cd .. # go folder up
rm -rf tmp/.git # remove .git
mv tmp/* $SUBMODULE_PATH/ # move the submodule to the submodule path

# BANDAID: set node version to 18.x
sed -i 's/"node": "[^"]*"/"node": "18.x"/' package.json


# clean up
rm -rf tmp # remove the tmp folder
rm -rf tmp # remove the tmp folder

0 comments on commit c9558e6

Please sign in to comment.