Skip to content

Commit

Permalink
fix to health issue and addressed other comments
Browse files Browse the repository at this point in the history
  • Loading branch information
williamw04 committed Jan 12, 2025
1 parent de05934 commit ccace74
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 78 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ nohup.out
src/server/tmp/*

#ui-testing screenshots
cypress/screenshots/
src/cypress/screenshots/*
6 changes: 3 additions & 3 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
import { defineConfig } from "cypress";

import { defineConfig } from "cypress";

export default defineConfig({
e2e: {
Expand All @@ -13,4 +13,4 @@ export default defineConfig({
supportFile: 'src/cypress/support/e2e.ts',
screenshotsFolder: 'cypress/screenshots/e2e',
},
});
});
16 changes: 13 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ services:
- POSTGRES_PASSWORD=pleaseChange # default postgres password that should be changed for security.
volumes:
- ./postgres-data:/var/lib/postgresql/data/pgdata
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
interval: 10s
timeout: 10s
retries: 3
# ports:
# - "5432:5432"
# Uncomment the above lines to enable access to the PostgreSQL server
Expand Down Expand Up @@ -68,10 +73,15 @@ services:
# and comment out the debug port and 3000:3000 line above
# Don't bring this up without the DB
depends_on:
- database
# database:
# - database
database:
# We need the database and it has to be ready for work (see healthcheck above).
# condition: service_healthy
condition: service_healthy
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:3000"]
interval: 10s
timeout: 5s
retries: 5
# Lets docker compose up work right
# If environment variable install_args is not set then it becomes blank without warning user.
command:
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

70 changes: 0 additions & 70 deletions src/cypress/e2e/test.cy.ts

This file was deleted.

0 comments on commit ccace74

Please sign in to comment.