diff --git a/Dockerfile b/Dockerfile index 0a70286..3dd4eef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Dockerfile.dev b/Dockerfile.dev index c0ad0b0..ffc9023 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -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 \ No newline at end of file diff --git a/dockerRunnerDev.sh b/dockerRunnerDev.sh index 02a0cfd..177f769 100755 --- a/dockerRunnerDev.sh +++ b/dockerRunnerDev.sh @@ -4,6 +4,10 @@ trap 'kill $CONTINUOUS_INSTALL_PID $SERVER_PID $BACKEND_SERVER_PID; exit' INT mkdir logs +touch ./logs/frontend_installer.log +touch ./logs/frontend_runner.log +touch ./logs/backend_installer.log +touch ./logs/backend_runner.log # Reset log file content for new application boot echo "*** Logs for continuous frontend installer ***" > ./logs/frontend_installer.log diff --git a/dockerRunnerProd.sh b/dockerRunnerProd.sh index ebf5b4f..2c2806e 100755 --- a/dockerRunnerProd.sh +++ b/dockerRunnerProd.sh @@ -1,11 +1,9 @@ #!/bin/sh cd frontend -npm install ( npm run start ) & SERVER_PID=$! cd ../backend -npm install ( npm run start ) & BACKEND_SERVER_PID=$! # Handle application background process exiting