Skip to content

Commit

Permalink
Merge branch 'dev' into dependabot/npm_and_yarn/frontend/rollup-2.79.2
Browse files Browse the repository at this point in the history
  • Loading branch information
smalho01 authored Sep 30, 2024
2 parents 568b06c + 0bd50ff commit 1286f3d
Show file tree
Hide file tree
Showing 12 changed files with 358 additions and 217 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ WORKDIR /home/node/app

EXPOSE 5050

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=30s --start-period=60s --timeout=10m --retries=10 CMD wget --no-verbose --tries=1 --spider http://localhost:5051/doctorOrders/api/getRx/pending || exit 1

CMD ./dockerRunnerProd.sh
2 changes: 2 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +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

CMD ./dockerRunnerDev.sh
2 changes: 1 addition & 1 deletion backend/env.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
},
"EHR_RXFILL_URL": {
"type": "string",
"default": "http://localhost:8080/test-ehr/script/rxfill"
"default": "http://localhost:8080/test-ehr/ncpdp/script"
},
"USE_INTERMEDIARY": {
"type": "boolean",
Expand Down
Loading

0 comments on commit 1286f3d

Please sign in to comment.