-
Notifications
You must be signed in to change notification settings - Fork 563
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* chore(deps): remove pm2 (^5.3.1) as it's no longer needed * chore: remove unused pm2bootstrap.ts files & commands * chore(env): remove PM2-related variables from multiple .env files * chore(ci): remove PM2-related secrets from YAML configuration files * fix(cspell): typo spelling :-) * fix(cspell): typo spelling :-) * Update Dockerfile --------- Co-authored-by: Ruslan Konviser <[email protected]>
- Loading branch information
1 parent
2188b19
commit 23c4718
Showing
36 changed files
with
189 additions
and
826 deletions.
There are no files selected for viewing
This file contains 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 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 |
---|---|---|
|
@@ -74,9 +74,6 @@ ARG UNLEASH_INSTANCE_ID | |
ARG UNLEASH_REFRESH_INTERVAL | ||
ARG UNLEASH_METRICS_INTERVAL | ||
ARG UNLEASH_API_KEY | ||
ARG PM2_PUBLIC_KEY | ||
ARG PM2_SECRET_KEY | ||
ARG PM2_MACHINE_NAME | ||
ARG JITSU_SERVER_URL | ||
ARG JITSU_SERVER_WRITE_KEY | ||
ARG GAUZY_GITHUB_CLIENT_ID | ||
|
@@ -121,15 +118,10 @@ RUN apk --update add bash && npm i -g npm@9 \ | |
&& apk add --no-cache --virtual build-dependencies bind-tools curl tar xz jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \ | ||
snappy libheif dos2unix gcc g++ snappy-dev git libgcc libstdc++ linux-headers autoconf automake make nasm vips-dev vips | ||
|
||
# Verify the Node.js version | ||
RUN node --version | ||
RUN npm --version | ||
# Verify installed versions | ||
RUN node --version && npm --version && python3 --version | ||
|
||
# Output Python3 version | ||
RUN python3 --version | ||
|
||
RUN npm install --quiet [email protected] -g | ||
RUN npm install yarn -g --force | ||
RUN npm install --quiet [email protected] -g && npm install yarn -g --force | ||
RUN mkdir /srv/gauzy && chown -R node:node /srv/gauzy | ||
|
||
COPY wait .deploy/api/entrypoint.prod.sh .deploy/api/entrypoint.compose.sh / | ||
|
@@ -162,15 +154,13 @@ COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugin | |
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/ | ||
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/ | ||
|
||
# We do not build here Wakatime plugin, because it used in Desktop Apps for now | ||
# We do not build Wakatime plugin here, because it is used in Desktop Apps for now | ||
# COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/ | ||
|
||
COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock ./ | ||
COPY --chown=node:node .scripts/postinstall.ts ./.scripts/ | ||
|
||
RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts | ||
RUN yarn postinstall.manual | ||
RUN yarn cache clean | ||
RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts && yarn postinstall.manual && yarn cache clean | ||
|
||
FROM node:20.11.1-alpine3.19 AS prodDependencies | ||
|
||
|
@@ -186,15 +176,10 @@ RUN apk --update add bash && npm i -g npm@9 \ | |
&& apk add --no-cache --virtual build-dependencies bind-tools curl tar xz jq python3 python3-dev py3-configobj py3-pip py3-setuptools build-base \ | ||
snappy libheif dos2unix gcc g++ snappy-dev git libgcc libstdc++ linux-headers autoconf automake make nasm vips-dev vips | ||
|
||
# Verify the Node.js version | ||
RUN node --version | ||
RUN npm --version | ||
# Verify installed versions | ||
RUN node --version && npm --version && python3 --version | ||
|
||
# Output Python3 version | ||
RUN python3 --version | ||
|
||
RUN npm install --quiet [email protected] -g | ||
RUN npm install yarn -g --force | ||
RUN npm install --quiet [email protected] -g && npm install yarn -g --force | ||
RUN mkdir /srv/gauzy && chown -R node:node /srv/gauzy | ||
|
||
USER node:node | ||
|
@@ -230,9 +215,7 @@ COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plu | |
COPY --chown=node:node decorate-angular-cli.js lerna.json package.json yarn.lock ./ | ||
COPY --chown=node:node .scripts/postinstall.ts ./.scripts/ | ||
|
||
RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts --production | ||
RUN yarn postinstall.manual | ||
RUN yarn cache clean | ||
RUN yarn install --network-timeout 1000000 --frozen-lockfile --ignore-scripts --production && yarn postinstall.manual && yarn cache clean | ||
|
||
# We remove Angular modules as it's not used in APIs | ||
RUN rm -r node_modules/@angular | ||
|
@@ -316,9 +299,7 @@ COPY --chown=node:node --from=prodDependencies /srv/gauzy/node_modules /tmp/node | |
# Add a script to merge directories inside the container (skip files that already exists) | ||
RUN cp -rn /tmp/node_modules_temp/* ./node_modules/ && rm -rf /tmp/node_modules_temp | ||
|
||
RUN npm install [email protected] -g && \ | ||
mkdir /import && chown node:node /import && \ | ||
touch ormlogs.log && chown node:node ormlogs.log && chown node:node wait && \ | ||
RUN mkdir /import && chown node:node /import && touch ormlogs.log && chown node:node ormlogs.log && chown node:node wait && \ | ||
chmod +x wait entrypoint.compose.sh entrypoint.prod.sh && chown -R node:node apps/ | ||
|
||
# Clean up | ||
|
@@ -346,7 +327,7 @@ RUN cp -r ./packages/plugins/product-reviews/node_modules ./node_modules/@gauzy/ | |
RUN cp -r ./packages/plugins/sentry-tracing/node_modules ./node_modules/@gauzy/plugin-sentry/ | ||
RUN cp -r ./packages/plugins/videos/node_modules ./node_modules/@gauzy/plugin-videos/ | ||
|
||
# We do not copy node_modules here for Wakatime plugin, because it used in Desktop Apps for now | ||
# We do not copy node_modules for Wakatime plugin here, because it is used in Desktop Apps for now | ||
# RUN cp -r ./packages/plugins/integration-wakatime/node_modules ./node_modules/@gauzy/plugin-integration-wakatime/ | ||
|
||
# we don't need packages folder anymore | ||
|
@@ -432,9 +413,6 @@ ENV UNLEASH_INSTANCE_ID=${UNLEASH_INSTANCE_ID} | |
ENV UNLEASH_REFRESH_INTERVAL=${UNLEASH_REFRESH_INTERVAL} | ||
ENV UNLEASH_METRICS_INTERVAL=${UNLEASH_METRICS_INTERVAL} | ||
ENV UNLEASH_API_KEY=${UNLEASH_API_KEY} | ||
ENV PM2_PUBLIC_KEY=${PM2_PUBLIC_KEY} | ||
ENV PM2_SECRET_KEY=${PM2_SECRET_KEY} | ||
ENV PM2_MACHINE_NAME=${PM2_MACHINE_NAME} | ||
ENV JITSU_SERVER_URL=${JITSU_SERVER_URL} | ||
ENV JITSU_SERVER_WRITE_KEY=${JITSU_SERVER_WRITE_KEY} | ||
ENV GAUZY_GITHUB_CLIENT_ID=${GAUZY_GITHUB_CLIENT_ID} | ||
|
This file contains 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
Oops, something went wrong.