Skip to content

Commit

Permalink
feat: merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
* develop:
  feat: updated document model deps
  adding `PORT` env var and healthcheck endpoints

# Conflicts:
#	package-lock.json
  • Loading branch information
acaldas committed Aug 2, 2024
2 parents 5eefcd8 + efc3814 commit 92680ec
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 19 deletions.
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,11 @@ FROM macbre/nginx-brotli:latest AS runner
ARG X_TAG
WORKDIR /opt/app
ENV NODE_ENV=production
ARG PORT=80
ENV PORT=${PORT}
ARG BASE_PATH="/alpha/powerhouse/connect"
ENV BASE_PATH=${BASE_PATH}
COPY --from=builder /opt/app/dist /usr/share/nginx/html

COPY nginx.conf /etc/nginx/conf.d/default.conf.template
CMD /bin/sh -c "envsubst '\$PORT,\$BASE_PATH' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf" && nginx -g 'daemon off;'
CMD /bin/sh -c "envsubst '\$PORT,\$BASE_PATH' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf" && nginx -g 'daemon off;'
15 changes: 14 additions & 1 deletion nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,17 @@ server {
expires -1;
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
}
}

# Health check endpoints
location /healthz {
access_log off;
return 200 'OK';
add_header Content-Type text/plain;
}

location /readiness {
access_log off;
return 200 'OK';
add_header Content-Type text/plain;
}
}
30 changes: 15 additions & 15 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@
"@sentry/react": "^7.109.0",
"@tanstack/react-virtual": "^3.8.1",
"did-key-creator": "^1.2.0",
"document-drive": "1.0.0-alpha.82",
"document-drive": "^1.0.0-alpha.88",
"document-model": "1.7.0",
"document-model-libs": "^1.77.0",
"document-model-libs": "^1.78.0",
"electron-is-dev": "^3.0.1",
"electron-squirrel-startup": "^1.0.0",
"electron-store": "^8.1.0",
Expand Down

0 comments on commit 92680ec

Please sign in to comment.