Skip to content

Main and staging sync #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amaan1114 merged 10 commits into from
Jul 24, 2026
Merged

Main and staging sync #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5406209
Merge pull request #16 from devclub-nstru/development
amaan1114 Jul 23, 2026
053d76e
CI/CD: Update for DB migration
amaan1114 Jul 23, 2026
6d35c28
CI/CD: Fix CI/CD and docker compose production.
amaan1114 Jul 23, 2026
0e23f93
fix:dependencies changed
amaan1114 Jul 23, 2026
3167796
fix:dockerFile fix for server.
amaan1114 Jul 23, 2026
69961f3
fix:new migration
amaan1114 Jul 23, 2026
f9f30d8
CI/CD: Removed migration
amaan1114 Jul 23, 2026
c37fc09
CI/CD: Fixed migration Issue
amaan1114 Jul 23, 2026
060af83
fix: Removed Migration from CI/CD
amaan1114 Jul 23, 2026
d4a5fc4
Merge pull request #19 from devclub-nstru/staging
amaan1114 Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/server/docker/dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ COPY package*.json ./
RUN npm i --omit=dev

COPY --from=builder /app/dist ./dist
COPY --from=builder /app/drizzle.config.ts ./drizzle.config.ts
COPY --from=builder /app/migrations ./migrations

USER node

Expand Down
0 app/server/migrations/0000_busy_venom.sql → app/server/migrations/0000_red_vermin.sql
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion app/server/migrations/meta/0000_snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"id": "2085f98e-e33f-4cf6-a004-ab83e2eae507",
"id": "8c008a9e-ace6-4d3e-9cdd-49cd02e2d00b",
"prevId": "00000000-0000-0000-0000-000000000000",
"version": "7",
"dialect": "postgresql",
Expand Down
4 changes: 2 additions & 2 deletions app/server/migrations/meta/_journal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{
"idx": 0,
"version": "7",
"when": 1784814591157,
"tag": "0000_busy_venom",
"when": 1784823827001,
"tag": "0000_red_vermin",
"breakpoints": true
}
]
Expand Down
2 changes: 1 addition & 1 deletion app/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"typescript": "^6.0.3",
"winston": "^3.19.0",
"ws": "^8.21.0",
"drizzle-kit": "^0.31.10",
"zod": "^4.4.3"
},
"devDependencies": {
Expand All @@ -66,7 +67,6 @@
"@types/swagger-ui-express": "^4.1.8",
"@types/winston": "^2.4.4",
"@types/ws": "^8.18.1",
"drizzle-kit": "^0.31.10",
"jest": "^30.4.2",
"supertest": "^7.2.2",
"ts-jest": "^29.4.11"
Expand Down
2 changes: 0 additions & 2 deletions docker/docker-compose.prod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
nginx:
image: nginx:latest
Expand Down
Loading