Skip to content

Dev #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smalho01 merged 4 commits into from
Aug 29, 2024
Merged

Dev #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2544f89
install typescript globally
smalho01 Aug 29, 2024
246f4d0
remove logging from prod
smalho01 Aug 29, 2024
e54b1c8
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
smalho01 Aug 29, 2024
4975564
Merge branch 'main' into dev
smalho01 Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,19 @@ ENV NODE_ENV production

WORKDIR /home/node/app
COPY --chown=node:node . .
RUN npm install -g typescript

WORKDIR /home/node/app/backend
RUN npm install
RUN npm link typescript

WORKDIR /home/node/app/frontend
RUN npm install
RUN npm link typescript

WORKDIR /home/node/app

RUN npm install pm2 -g
# RUN npm install pm2 -g

EXPOSE 5050
EXPOSE 5051
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@ FROM node:14-alpine

WORKDIR /home/node/app
COPY --chown=node:node . .
RUN npm install -g typescript

WORKDIR /home/node/app/backend
RUN npm install
RUN npm link typescript

WORKDIR /home/node/app/frontend
RUN npm install
RUN npm link typescript

WORKDIR /home/node/app

EXPOSE 5050
Expand Down
8 changes: 4 additions & 4 deletions dockerRunnerProd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/sh

cd frontend
npm install | tee ./logs/frontend_installer.log
( npm run start | tee ./logs/frontend_runner.log ) & SERVER_PID=$!
npm install
( npm run start ) & SERVER_PID=$!

cd ../backend
npm install | tee ./logs/backend_installer.log
( npm run start | tee ./logs/backend_runner.log ) & BACKEND_SERVER_PID=$!
npm install
( npm run start ) & BACKEND_SERVER_PID=$!