Skip to content

Commit

Permalink
added recommended changes by code rabbit
Browse files Browse the repository at this point in the history
  • Loading branch information
VanshikaSabharwal committed Nov 11, 2024
1 parent 9a2b428 commit 12e5474
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 7 deletions.
13 changes: 10 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
node_modules
npm-debug.log
Dockerfile
.dockerignore
.git
.gitignore
README.md
.env
.env.*
dist
Expand All @@ -15,4 +13,13 @@ coverage
tests
__tests__
*.test.*
*.spec.*
*.spec.*
# Development files
*.log
*.lock
.DS_Store
.idea
.vscode
# Build artifacts
build
out
2 changes: 2 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql/
# If you want to logs Compiletime and Runtime error , warning and info write YES or if u want to
# keep the console clean leave it blank
ALLOW_LOGS=

REACT_APP_TALAWA_URL=http://localhost:4000
12 changes: 9 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -286,24 +286,30 @@ jobs:
- name: Check if Talawa Admin App is running
run: |
echo "Starting health check for application on localhost:4321"
timeout=${HEALTH_CHECK_TIMEOUT:-120}
timeout="${HEALTH_CHECK_TIMEOUT:-120}"
echo "Starting health check with ${timeout}s timeout"
while ! nc -z localhost 4321 && [ $timeout -gt 0 ]; do
sleep 1
timeout=$((timeout-1))
if [ $((timeout % 10)) -eq 0]; then
echo "Still waiting for app to start... ${timeout}s remaining"
fi
done
if [ $timeout -eq 0 ]; then
echo "Timeout waiting for application to start"
exit 1
fi
echo "Port check passed, verifying health endpoint..."
curl --fail --silent http://localhost:4321/health || exit 1
echo "Health check passed successfully"
- name: Stop Docker Container
if: always()
run: |
docker stop talawa-admin-app-container
docker rm talawa-admin-app-container
exit 1

Check-Target-Branch:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
context: .
dockerfile: Dockerfile
environment:
- REACT_APP_TALAWA_URL=${REACT_APP_TALAWA_URL}
- REACT_APP_TALAWA_URL=${REACT_APP_TALAWA_URL:?Error: REACT_APP_TALAWA_URL is required}
ports:
- 4321:4321
user: node
Expand Down

0 comments on commit 12e5474

Please sign in to comment.