Stage #9269
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -44,7 +44,8 @@ LABEL org.opencontainers.image.source="https://github.com/ever-co/ever-gauzy" | |||||
|
|
||||||
| RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \ | ||||||
| && npm install --quiet [email protected] -g \ | ||||||
| && npm install yarn -g --force \ | ||||||
| && npm install --quiet [email protected] -g | ||||||
| RUN mkdir /srv/gauzy-mcp-auth && chown -R node:node /srv/gauzy-mcp-auth | ||||||
|
|
||||||
| USER node:node | ||||||
|
|
@@ -61,9 +62,10 @@ COPY --chown=node:node packages/core/package.json ./packages/core/ | |||||
| COPY --chown=node:node packages/plugin/package.json ./packages/plugin/ | ||||||
| COPY --chown=node:node packages/utils/package.json ./packages/utils/ | ||||||
| COPY --chown=node:node lerna.json package.json yarn.lock ./ | ||||||
| COPY --chown=node:node .scripts/postinstall.js ./.scripts/ | ||||||
|
|
||||||
| RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts \ | ||||||
| && yarn postinstall.manual \ | ||||||
| && yarn cache clean | ||||||
|
|
||||||
| COPY --chown=node:node apps/mcp-auth ./apps/mcp-auth | ||||||
|
|
@@ -102,17 +104,19 @@ RUN yarn build:mcp-auth:prod | |||||
| FROM node:20.18.1-alpine3.19 AS proddependencies | ||||||
|
|
||||||
| RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \ | ||||||
| && npm install --quiet [email protected] -g \ | ||||||
| && npm install --quiet [email protected] -g | ||||||
|
|
||||||
| USER node:node | ||||||
|
|
||||||
| WORKDIR /srv/gauzy-mcp-auth | ||||||
|
|
||||||
| COPY --chown=node:node --from=build /srv/gauzy-mcp-auth/dist . | ||||||
| COPY --chown=node:node lerna.json package.json yarn.lock ./ | ||||||
| COPY --chown=node:node .scripts/postinstall.js ./.scripts/ | ||||||
|
|
||||||
| RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts --production \ | ||||||
| && yarn postinstall.manual \ | ||||||
|
Contributor
There was a problem hiding this comment. logic: Same issue in production dependencies stage - the postinstall.js script has incorrect rebuild logic. Restore the explicit
Suggested change
Prompt To Fix With AIThis is a comment left during a code review.
Path: .deploy/mcp-auth/Dockerfile
Line: 119:119
Comment:
**logic:** Same issue in production dependencies stage - the postinstall.js script has incorrect rebuild logic. Restore the explicit `npm rebuild` command.
```suggestion
&& node ./.scripts/postinstall.js && npm rebuild bcrypt better-sqlite3 --build-from-source \
```
How can I resolve this? If you propose a fix, please make it concise. |
||||||
| && yarn cache clean | ||||||
|
|
||||||
| # PROD | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -90,7 +90,8 @@ LABEL org.opencontainers.image.source="https://github.com/ever-co/ever-gauzy" | |||||
|
|
||||||
| RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \ | ||||||
| && npm install --quiet [email protected] -g \ | ||||||
| && npm install yarn -g --force \ | ||||||
| && npm install --quiet [email protected] -g | ||||||
|
|
||||||
| RUN mkdir /srv/gauzy-mcp && chown -R node:node /srv/gauzy-mcp | ||||||
|
|
||||||
|
|
@@ -107,9 +108,10 @@ COPY --chown=node:node packages/constants/package.json ./packages/constants/ | |||||
| COPY --chown=node:node packages/contracts/package.json ./packages/contracts/ | ||||||
| COPY --chown=node:node packages/utils/package.json ./packages/utils/ | ||||||
| COPY --chown=node:node lerna.json package.json yarn.lock ./ | ||||||
| COPY --chown=node:node .scripts/postinstall.js ./.scripts/ | ||||||
|
|
||||||
| RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts \ | ||||||
| && yarn postinstall.manual \ | ||||||
|
Contributor
There was a problem hiding this comment. logic: The postinstall.js script cannot properly rebuild native modules - it runs
Suggested change
Prompt To Fix With AIThis is a comment left during a code review.
Path: .deploy/mcp/Dockerfile
Line: 114:114
Comment:
**logic:** The postinstall.js script cannot properly rebuild native modules - it runs `yarn add` from inside the package directory instead of running `npm rebuild` from the root. Restore the explicit rebuild command.
```suggestion
&& node ./.scripts/postinstall.js && npm rebuild bcrypt --build-from-source \
```
How can I resolve this? If you propose a fix, please make it concise. |
||||||
| && yarn cache clean | ||||||
|
|
||||||
| COPY --chown=node:node apps/mcp ./apps/mcp | ||||||
|
|
@@ -147,17 +149,19 @@ RUN yarn build:mcp:prod | |||||
| FROM node:20.18.1-alpine3.19 AS proddependencies | ||||||
|
|
||||||
| RUN apk add --no-cache python3 python3-dev py3-pip py3-setuptools build-base gcc g++ make autoconf automake git \ | ||||||
| && npm install --quiet [email protected] -g \ | ||||||
| && npm install --quiet [email protected] -g | ||||||
|
|
||||||
| USER node:node | ||||||
|
|
||||||
| WORKDIR /srv/gauzy-mcp | ||||||
|
|
||||||
| COPY --chown=node:node --from=build /srv/gauzy-mcp/dist . | ||||||
| COPY --chown=node:node lerna.json package.json yarn.lock ./ | ||||||
| COPY --chown=node:node .scripts/postinstall.js ./.scripts/ | ||||||
|
|
||||||
| RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts --production \ | ||||||
| && yarn postinstall.manual \ | ||||||
|
Contributor
There was a problem hiding this comment. logic: Same issue in production dependencies - restore the explicit
Suggested change
Prompt To Fix With AIThis is a comment left during a code review.
Path: .deploy/mcp/Dockerfile
Line: 164:164
Comment:
**logic:** Same issue in production dependencies - restore the explicit `npm rebuild` command to properly build native modules.
```suggestion
&& node ./.scripts/postinstall.js && npm rebuild bcrypt --build-from-source \
```
How can I resolve this? If you propose a fix, please make it concise. |
||||||
| && yarn cache clean | ||||||
|
|
||||||
| # PROD | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6503,22 +6503,24 @@ | |
| postgres-interval "4.0.2" | ||
|
|
||
| "@modelcontextprotocol/sdk@^1.13.1": | ||
| version "1.24.0" | ||
| resolved "https://registry.yarnpkg.com/@modelcontextprotocol/sdk/-/sdk-1.24.0.tgz#3bd1d539490d1d4228537ab815b8d854bc0e3143" | ||
| integrity sha512-D8h5KXY2vHFW8zTuxn2vuZGN0HGrQ5No6LkHwlEA9trVgNdPL3TF1dSqKA7Dny6BbBYKSW/rOBDXdC8KJAjUCg== | ||
| dependencies: | ||
| ajv "^8.17.1" | ||
| ajv-formats "^3.0.1" | ||
| content-type "^1.0.5" | ||
| cors "^2.8.5" | ||
| cross-spawn "^7.0.5" | ||
| eventsource "^3.0.2" | ||
| eventsource-parser "^3.0.0" | ||
| express "^5.0.1" | ||
| express-rate-limit "^7.5.0" | ||
| jose "^6.1.1" | ||
| pkce-challenge "^5.0.0" | ||
| raw-body "^3.0.0" | ||
| zod "^3.25 || ^4.0" | ||
| zod-to-json-schema "^3.25.0" | ||
|
|
||
| "@modern-js/[email protected]": | ||
| version "2.65.1" | ||
|
|
@@ -13672,27 +13674,27 @@ | |
| dependencies: | ||
| "@types/node" "*" | ||
|
|
||
| "@typescript-eslint/project-service@8.49.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/project-service/-/project-service-8.49.0.tgz#ce220525c88cb2d23792b391c07e14cb9697651a" | ||
| integrity sha512-/wJN0/DKkmRUMXjZUXYZpD1NEQzQAAn9QWfGwo+Ai8gnzqH7tvqS7oNVdTjKqOcPyVIdZdyCMoqN66Ia789e7g== | ||
| dependencies: | ||
| "@typescript-eslint/tsconfig-utils" "^8.49.0" | ||
| "@typescript-eslint/types" "^8.49.0" | ||
| debug "^4.3.4" | ||
|
|
||
| "@typescript-eslint/scope-manager@8.49.0", "@typescript-eslint/scope-manager@^8.31.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.49.0.tgz#a3496765b57fb48035d671174552e462e5bffa63" | ||
| integrity sha512-npgS3zi+/30KSOkXNs0LQXtsg9ekZ8OISAOLGWA/ZOEn0ZH74Ginfl7foziV8DT+D98WfQ5Kopwqb/PZOaIJGg== | ||
| dependencies: | ||
| "@typescript-eslint/types" "8.49.0" | ||
| "@typescript-eslint/visitor-keys" "8.49.0" | ||
|
|
||
| "@typescript-eslint/tsconfig-utils@8.49.0", "@typescript-eslint/tsconfig-utils@^8.49.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.49.0.tgz#857777c8e35dd1e564505833d8043f544442fbf4" | ||
| integrity sha512-8prixNi1/6nawsRYxet4YOhnbW+W9FK/bQPxsGB1D3ZrDzbJ5FXw5XmzxZv82X3B+ZccuSxo/X8q9nQ+mFecWA== | ||
|
|
||
| "@typescript-eslint/type-utils@^8.0.0": | ||
| version "8.32.0" | ||
|
|
@@ -13709,10 +13711,10 @@ | |
| resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.32.0.tgz#a4a66b8876b8391970cf069b49572e43f1fc957a" | ||
| integrity sha512-O5Id6tGadAZEMThM6L9HmVf5hQUXNSxLVKeGJYWNhhVseps/0LddMkp7//VDkzwJ69lPL0UmZdcZwggj9akJaA== | ||
|
|
||
| "@typescript-eslint/types@8.49.0", "@typescript-eslint/types@^8.49.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.49.0.tgz#c1bd3ebf956d9e5216396349ca23c58d74f06aee" | ||
| integrity sha512-e9k/fneezorUo6WShlQpMxXh8/8wfyc+biu6tnAqA81oWrEic0k21RHzP9uqqpyBBeBKu4T+Bsjy9/b8u7obXQ== | ||
|
|
||
| "@typescript-eslint/[email protected]": | ||
| version "8.32.0" | ||
|
|
@@ -13728,37 +13730,37 @@ | |
| semver "^7.6.0" | ||
| ts-api-utils "^2.1.0" | ||
|
|
||
| "@typescript-eslint/typescript-estree@8.49.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.49.0.tgz#99c5a53275197ccb4e849786dad68344e9924135" | ||
| integrity sha512-jrLdRuAbPfPIdYNppHJ/D0wN+wwNfJ32YTAm10eJVsFmrVpXQnDWBn8niCSMlWjvml8jsce5E/O+86IQtTbJWA== | ||
| dependencies: | ||
| "@typescript-eslint/project-service" "8.49.0" | ||
| "@typescript-eslint/tsconfig-utils" "8.49.0" | ||
| "@typescript-eslint/types" "8.49.0" | ||
| "@typescript-eslint/visitor-keys" "8.49.0" | ||
| debug "^4.3.4" | ||
| minimatch "^9.0.4" | ||
| semver "^7.6.0" | ||
| tinyglobby "^0.2.15" | ||
| ts-api-utils "^2.1.0" | ||
|
|
||
| "@typescript-eslint/[email protected]", "@typescript-eslint/utils@^5.58.0", "@typescript-eslint/utils@^8.0.0", "@typescript-eslint/utils@^8.31.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.49.0.tgz#43b3b91d30afd6f6114532cf0b228f1790f43aff" | ||
| integrity sha512-N3W7rJw7Rw+z1tRsHZbK395TWSYvufBXumYtEGzypgMUthlg0/hmCImeA8hgO2d2G4pd7ftpxxul2J8OdtdaFA== | ||
| dependencies: | ||
| "@eslint-community/eslint-utils" "^4.7.0" | ||
| "@typescript-eslint/scope-manager" "8.49.0" | ||
| "@typescript-eslint/types" "8.49.0" | ||
| "@typescript-eslint/typescript-estree" "8.49.0" | ||
|
|
||
| "@typescript-eslint/[email protected]", "@typescript-eslint/visitor-keys@8.49.0", "@typescript-eslint/visitor-keys@^8.31.0": | ||
| version "8.49.0" | ||
| resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.49.0.tgz#8e450cc502c0d285cad9e84d400cf349a85ced6c" | ||
| integrity sha512-LlKaciDe3GmZFphXIc79THF/YYBugZ7FS1pO581E/edlVVNbZKDy93evqmrfQ9/Y4uN0vVhX4iuchq26mK/iiA== | ||
| dependencies: | ||
| "@typescript-eslint/types" "8.49.0" | ||
| eslint-visitor-keys "^4.2.1" | ||
|
|
||
| "@upwork/node-upwork-oauth2@^2.0.3": | ||
|
|
@@ -14358,7 +14360,7 @@ aggregate-error@^5.0.0: | |
| clean-stack "^5.2.0" | ||
| indent-string "^5.0.0" | ||
|
|
||
| [email protected], ajv-formats@^3.0.1: | ||
| version "3.0.1" | ||
| resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-3.0.1.tgz#3d5dc762bca17679c3c2ea7e90ad6b7532309578" | ||
| integrity sha512-8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ== | ||
|
|
@@ -14394,7 +14396,7 @@ [email protected], ajv@^8.0.0, ajv@^8.0.1, ajv@^8.11.0, ajv@^8.12.0, ajv@^8.17.1, ajv@^ | |
| json-schema-traverse "^1.0.0" | ||
| require-from-string "^2.0.2" | ||
|
|
||
| ajv@^6.10.0, ajv@^6.11.0, ajv@^6.12.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.5: | ||
| version "6.12.6" | ||
| resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" | ||
| integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== | ||
|
|
@@ -25802,10 +25804,10 @@ jose@^5.0.0: | |
| resolved "https://registry.yarnpkg.com/jose/-/jose-5.10.0.tgz#c37346a099d6467c401351a9a0c2161e0f52c4be" | ||
| integrity sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg== | ||
|
|
||
| jose@^6.0.13, jose@^6.1.1: | ||
| version "6.1.3" | ||
| resolved "https://registry.yarnpkg.com/jose/-/jose-6.1.3.tgz#8453d7be88af7bb7d64a0481d6a35a0145ba3ea5" | ||
| integrity sha512-0TpaTfihd4QMNwrz/ob2Bp7X04yuxJkjRGi4aKmOqwhov54i6u79oCv7T+C7lo70MKH6BesI3vscD1yb/yzKXQ== | ||
|
|
||
| joycon@^3.1.1: | ||
| version "3.1.1" | ||
|
|
@@ -40132,17 +40134,22 @@ zip-stream@^6.0.1: | |
| compress-commons "^6.0.2" | ||
| readable-stream "^4.0.0" | ||
|
|
||
| zod-to-json-schema@^3.25.0: | ||
| version "3.25.0" | ||
| resolved "https://registry.yarnpkg.com/zod-to-json-schema/-/zod-to-json-schema-3.25.0.tgz#df504c957c4fb0feff467c74d03e6aab0b013e1c" | ||
| integrity sha512-HvWtU2UG41LALjajJrML6uQejQhNJx+JBO9IflpSja4R03iNWfKXrj6W2h7ljuLyc1nKS+9yDyL/9tD1U/yBnQ== | ||
|
|
||
| [email protected]: | ||
| version "4.1.11" | ||
| resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.11.tgz#4aab62f76cfd45e6c6166519ba31b2ea019f75f5" | ||
| integrity sha512-WPsqwxITS2tzx1bzhIKsEs19ABD5vmCVa4xBo2tq/SrV4RNZtfws1EnCWQXM6yh8bD08a1idvkB5MZSBiZsjwg== | ||
|
|
||
| "zod@^3.25 || ^4.0": | ||
| version "4.1.13" | ||
| resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.13.tgz#93699a8afe937ba96badbb0ce8be6033c0a4b6b1" | ||
| integrity sha512-AvvthqfqrAhNH9dnfmrfKzX5upOdjUVJYFqNSlkmGf64gRaTzlPwz99IHYnVs28qYAybvAlBV+H7pn0saFY4Ig== | ||
|
|
||
| zod@^3.25.67: | ||
| version "3.25.76" | ||
| resolved "https://registry.yarnpkg.com/zod/-/zod-3.25.76.tgz#26841c3f6fd22a6a2760e7ccb719179768471e34" | ||
| integrity sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ== | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
logic: The postinstall.js script (line 96) runs
yarn add ${packageName} --forcefrom insidenode_modules/{package}, which is incorrect. This will fail to properly rebuild native modules. The previous approach usingnpm rebuild bcrypt better-sqlite3 --build-from-sourcewas correct and should be restored.Prompt To Fix With AI