Skip to content
Merged

Dev #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
5c5ee81
update package lock and health check
smalho01 Oct 16, 2024
eba05f3
increase healthcheck time
smalho01 Oct 16, 2024
d48112a
increase health check times
smalho01 Oct 16, 2024
492d8b9
further health check time increase
smalho01 Oct 16, 2024
babeb04
Bump cookie and express in /backend
dependabot[bot] Oct 19, 2024
7f3b2f2
test vite config
smalho01 Oct 23, 2024
a3aef21
increase docker node version
smalho01 Oct 23, 2024
4943890
healthcheck timeouts
smalho01 Oct 23, 2024
d94abc1
run prettier
smalho01 Oct 23, 2024
646645e
Merge pull request #114 from mcode/dependabot/npm_and_yarn/backend/mu…
smalho01 Oct 23, 2024
6ed9f60
Bump http-proxy-middleware from 2.0.6 to 2.0.7 in /frontend
dependabot[bot] Oct 25, 2024
e6568a3
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/http-proxy-m…
smalho01 Oct 25, 2024
e97958a
Merge pull request #115 from mcode/dependabot/npm_and_yarn/frontend/h…
smalho01 Oct 25, 2024
74b4a9c
delete package lock
smalho01 Oct 28, 2024
619ad6d
Merge branch 'dev' into pims-package-lock-update
smalho01 Oct 28, 2024
e975ef4
update package-lock
smalho01 Oct 28, 2024
22b132e
Merge pull request #113 from mcode/pims-package-lock-update
smalho01 Oct 28, 2024
1d5c126
Bump cross-spawn from 7.0.3 to 7.0.6 in /frontend
dependabot[bot] Nov 21, 2024
d462cd7
Bump axios from 1.7.2 to 1.7.8 in /frontend
dependabot[bot] Dec 4, 2024
937267b
Bump cookie and express in /frontend
dependabot[bot] Dec 4, 2024
85edc47
Bump nanoid from 3.3.7 to 3.3.8 in /frontend
dependabot[bot] Dec 15, 2024
bd552ec
Bump mongoose from 6.13.0 to 8.9.5 in /backend
dependabot[bot] Jan 16, 2025
e17e113
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/cross-spawn-…
smalho01 Jan 21, 2025
ce0e746
Merge pull request #116 from mcode/dependabot/npm_and_yarn/frontend/c…
smalho01 Jan 21, 2025
150cbe5
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/axios-1.7.8
smalho01 Jan 21, 2025
fc9fe53
Update package-lock.json
smalho01 Jan 21, 2025
14be651
Update package.json
smalho01 Jan 21, 2025
1c9c8cd
Merge pull request #118 from mcode/dependabot/npm_and_yarn/frontend/a…
smalho01 Jan 21, 2025
4e703f7
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/multi-9f37c1…
smalho01 Jan 21, 2025
972cd70
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/nanoid-3.3.8
smalho01 Jan 21, 2025
7f787bc
Merge pull request #119 from mcode/dependabot/npm_and_yarn/frontend/m…
smalho01 Jan 21, 2025
6dfd493
Merge pull request #120 from mcode/dependabot/npm_and_yarn/frontend/n…
smalho01 Jan 21, 2025
8de2e72
Merge branch 'dev' into dependabot/npm_and_yarn/backend/mongoose-8.9.5
smalho01 Jan 21, 2025
c2aadd9
Delete ZScaler_Root.crt
smalho01 Jan 21, 2025
d2f0a96
Merge branch 'dev' into dependabot/npm_and_yarn/backend/mongoose-8.9.5
smalho01 Jan 21, 2025
ca35b2a
Merge pull request #121 from mcode/dependabot/npm_and_yarn/backend/mo…
smalho01 Jan 21, 2025
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
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-alpine
FROM node:18-alpine

WORKDIR /home/node/app
COPY --chown=node:node . .
Expand All @@ -12,7 +12,8 @@ RUN npm install
WORKDIR /home/node/app

EXPOSE 5050
EXPOSE 5051

HEALTHCHECK --interval=30s --start-period=60s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending || exit 1
HEALTHCHECK --interval=45s --start-period=45s --timeout=10m --retries=10 CMD (wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending && wget --no-verbose --tries=1 --spider http://localhost:5050) || exit 1

CMD ./dockerRunnerProd.sh
4 changes: 2 additions & 2 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-alpine
FROM node:18-alpine

WORKDIR /home/node/app
COPY --chown=node:node . .
Expand All @@ -14,6 +14,6 @@ WORKDIR /home/node/app
EXPOSE 5050
EXPOSE 5051

HEALTHCHECK --interval=30s --start-period=15s --timeout=10m --retries=10 CMD (wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending && wget --no-verbose --tries=1 --spider http://localhost:5050) || exit 1
HEALTHCHECK --interval=45s --start-period=45s --timeout=10m --retries=10 CMD (wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending && wget --no-verbose --tries=1 --spider http://localhost:5050) || exit 1

CMD ./dockerRunnerDev.sh
Loading
Loading