diff --git a/docker-compose.yml b/docker-compose.yml index 76dd543..cb3f8e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ version: '3.9' x-common: &common + depends_on: ["backend"] environment: VITE_USER_POOLS_ID: ca-central-1_FxagSNQa7 VITE_USER_POOLS_WEB_CLIENT_ID: 43hjhdf5dvi17opb0jgucfpvm7 @@ -22,8 +23,7 @@ services: CHES_TOKEN_URL : https://test.loginproxy.gov.bc.ca/auth/realms/comsvcauth/protocol/openid-connect/token CHES_CLIENT_ID : 09C5071A-ACE9B6FACF6 CHES_CLIENT_SECRET : 9c82d5fc-1d34-4a0c-97f2-c0c756791c34 - ports: - - "5000:5000" + ports: ["5000:5000"] volumes: ["./backend:/app", "/app/node_modules"] restart: always build: diff --git a/frontend/Caddyfile b/frontend/Caddyfile index 08a87cd..7808957 100644 --- a/frontend/Caddyfile +++ b/frontend/Caddyfile @@ -38,9 +38,3 @@ file_server } - -:3001 { - handle /health { - respond "OK" - } -} diff --git a/frontend/Dockerfile b/frontend/Dockerfile index c9b0a2a..bd35ec2 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -24,5 +24,5 @@ RUN apk add --no-cache ca-certificates && \ # User, port and healthcheck USER 1001 -EXPOSE 3000 3001 -HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost/:3001/health +EXPOSE 3000 +HEALTHCHECK --interval=30s --timeout=3s CMD curl -f http://localhost/:3000 diff --git a/frontend/openshift.deploy.yml b/frontend/openshift.deploy.yml index e77703c..5301fd1 100644 --- a/frontend/openshift.deploy.yml +++ b/frontend/openshift.deploy.yml @@ -132,8 +132,8 @@ objects: memory: "${MEMORY_LIMIT}" readinessProbe: httpGet: - path: /health - port: 3001 + path: / + port: 3000 scheme: HTTP initialDelaySeconds: 5 periodSeconds: 2 @@ -144,8 +144,8 @@ objects: successThreshold: 1 failureThreshold: 3 httpGet: - path: /health - port: 3001 + path: / + port: 3000 scheme: HTTP initialDelaySeconds: 15 periodSeconds: 30