Skip to content

Commit f74d994

Browse files
shahadathhsshahadathhs
committed
feat: cleanup codebase
1 parent 225300c commit f74d994

34 files changed

Lines changed: 50 additions & 1955 deletions

‎.env.example‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@ BASE_URL= http://localhost:3000
44
PORT= 3000
55

66
# Docker
7-
DOCKER_USERNAME=softvence
8-
PACKAGE_NAME=nestjs_starter
7+
DOCKER_USERNAME=shahadathhs
8+
PACKAGE_NAME=rag
99
PACKAGE_VERSION=latest
1010

11-
# Turn server
12-
TURN_USERS=webrtcuser:webrtcuser
13-
EXTERNAL_IP=10.10.10.52
14-
1511
# Database
16-
MONGODB_URI= mongodb://root:root@mongodb:27017/nestjs_starter_db?authSource=admin
12+
MONGODB_URI= mongodb://root:root@mongodb:27017/rag_db?authSource=admin
1713

1814
# Mongo root credentials
1915
MONGO_INITDB_ROOT_USERNAME=root
@@ -31,10 +27,6 @@ REDIS_PORT= 22376
3127
JWT_SECRET=secret
3228
JWT_EXPIRES_IN=90d
3329

34-
# SMTP
35-
MAIL_USER=test
36-
MAIL_PASS=test
37-
3830
# Seed Admin
39-
SUPER_ADMIN_EMAIL=test
40-
SUPER_ADMIN_PASS=test
31+
SUPER_ADMIN_EMAIL=superadmin@gmail.com
32+
SUPER_ADMIN_PASS=superadmin

‎.github/workflows/ci-cd.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Lint, Format, Build, Docker & Deploy
1+
name: Lint, Format & Build
22

33
on:
44
push:

‎Makefile‎

Lines changed: 19 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,138 +1,32 @@
1-
# Variables
2-
DOCKER_USERNAME=softvence
3-
PACKAGE_NAME=nestjs_starter
4-
PACKAGE_VERSION=latest
5-
6-
# Docker image name
7-
APP_IMAGE := $(DOCKER_USERNAME)/$(PACKAGE_NAME):$(PACKAGE_VERSION)
8-
9-
# Compose files
10-
COMPOSE_FILE := compose.yaml
11-
DEV_COMPOSE_FILE := compose.dev.yaml
12-
13-
# Docker files
14-
DOCKERFILE := Dockerfile
15-
DEV_DOCKERFILE := Dockerfile.dev
16-
17-
.PHONY: help build up start stop restart logs logs-api clean push ps dev-up dev-stop dev-logs dev-clean dev-ps local-up local-down local images volumes networks
1+
.PHONY: help dev up down logs clean build restart
182

193
help:
204
@echo "Available commands:"
21-
@echo ""
22-
@echo "Production Commands (Default):"
23-
@echo " make build Build the Docker image"
24-
@echo " make up Start containers (attached)"
25-
@echo " make start Start containers (detached)"
26-
@echo " make stop Stop containers"
27-
@echo " make restart Restart containers"
28-
@echo " make logs Show logs"
29-
@echo " make logs-api Show API logs"
30-
@echo " make clean Remove containers, networks, volumes"
31-
@echo " make push Push image to Docker Hub"
32-
@echo " make ps List production containers"
33-
@echo ""
34-
@echo "Development Commands (dev-* - Full Docker):"
35-
@echo " make dev-up Start full Docker dev environment (detached)"
36-
@echo " make dev-stop Stop Docker dev environment"
37-
@echo " make dev-logs Show logs from Docker dev environment"
38-
@echo " make dev-clean Clean Docker dev environment (remove volumes)"
39-
@echo " make dev-ps List development containers"
40-
@echo ""
41-
@echo "Local Development Commands (local-* - Hybrid):"
42-
@echo " make local-up Start dependencies (DB, Redis) only"
43-
@echo " make local-down Stop dependencies"
44-
@echo " make local Start deps and run 'pnpm dev' locally"
45-
@echo ""
46-
@echo "General / Inspection:"
47-
@echo " make images List images"
48-
@echo " make volumes List volumes"
49-
@echo " make networks List networks"
50-
@echo ""
5+
@echo " make dev - Start development environment (MongoDB, Redis, Mongo Express)"
6+
@echo " make up - Start all services including API"
7+
@echo " make down - Stop all services"
8+
@echo " make logs - View logs from all services"
9+
@echo " make clean - Remove all containers, volumes, and images"
10+
@echo " make build - Build the Docker image"
11+
@echo " make restart - Restart all services"
5112

52-
# ==========================================
53-
# Production Commands (Default)
54-
# ==========================================
55-
56-
build:
57-
docker build -t $(APP_IMAGE) .
13+
dev:
14+
docker compose up mongodb mongo-express redis -d
5815

5916
up:
60-
docker compose -f $(COMPOSE_FILE) --profile prod up --remove-orphans
61-
62-
start:
63-
docker compose -f $(COMPOSE_FILE) --profile prod up -d
17+
docker compose up -d
6418

65-
stop:
66-
docker compose -f $(COMPOSE_FILE) --profile prod down
67-
68-
restart:
69-
docker compose -f $(COMPOSE_FILE) --profile prod restart
70-
docker compose -f $(COMPOSE_FILE) --profile prod up -d
19+
down:
20+
docker compose down
7121

7222
logs:
73-
docker compose -f $(COMPOSE_FILE) --profile prod logs -f
74-
75-
logs-api:
76-
docker compose -f $(COMPOSE_FILE) --profile prod logs -f api
23+
docker compose logs -f
7724

7825
clean:
79-
docker compose -f $(COMPOSE_FILE) --profile prod down --volumes --remove-orphans
80-
docker rmi $(APP_IMAGE) || true
81-
82-
push:
83-
docker push $(APP_IMAGE)
84-
85-
ps:
86-
docker compose -f $(COMPOSE_FILE) --profile prod ps -a
87-
88-
# ==========================================
89-
# Development Commands (Full Docker)
90-
# ==========================================
26+
docker compose down -v --rmi all
9127

92-
dev-up:
93-
docker compose -f $(DEV_COMPOSE_FILE) up -d
94-
95-
dev-stop:
96-
docker compose -f $(DEV_COMPOSE_FILE) down
97-
98-
dev-logs:
99-
docker compose -f $(DEV_COMPOSE_FILE) logs -f
100-
101-
dev-clean:
102-
docker compose -f $(DEV_COMPOSE_FILE) down --volumes --remove-orphans
103-
104-
dev-ps:
105-
docker compose -f $(DEV_COMPOSE_FILE) ps -a
106-
107-
# ==========================================
108-
# Local Development Commands (Hybrid)
109-
# ==========================================
110-
111-
local-up:
112-
docker compose -f $(COMPOSE_FILE) --profile dev up -d
113-
114-
local-down:
115-
docker compose -f $(COMPOSE_FILE) --profile dev down
116-
117-
local:
118-
@echo "Starting development services..."
119-
@$(MAKE) local-up
120-
@echo "Waiting for services to be ready..."
121-
@sleep 3
122-
@echo "Installing dependencies..."
123-
pnpm install
124-
@echo "Starting application in development mode..."
125-
pnpm dev
126-
127-
# ==========================================
128-
# General / Inspection
129-
# ==========================================
130-
131-
images:
132-
docker images
133-
134-
volumes:
135-
docker volume ls
28+
build:
29+
docker compose build
13630

137-
networks:
138-
docker network ls
31+
restart:
32+
docker compose restart

‎compose.yaml‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
services:
22
api:
3-
profiles: ['prod']
43
platform: linux/amd64
54
image: ${DOCKER_USERNAME}/${PACKAGE_NAME}:${PACKAGE_VERSION}
65
container_name: ${PACKAGE_NAME}_api
@@ -11,7 +10,7 @@ services:
1110
NODE_ENV: production
1211
MONGODB_URI: mongodb://root:root@mongodb:27017/${PACKAGE_NAME}_db?authSource=admin
1312

14-
REDIS_HOST: redis-master
13+
REDIS_HOST: redis
1514
REDIS_PORT: 6379
1615

1716
BASE_URL: http://0.0.0.0:3000
@@ -21,7 +20,7 @@ services:
2120
depends_on:
2221
mongodb:
2322
condition: service_healthy
24-
redis-master:
23+
redis:
2524
condition: service_healthy
2625
command: >
2726
sh -c "
@@ -41,7 +40,7 @@ services:
4140

4241
mongodb:
4342
image: mongo:8
44-
container_name: ${PACKAGE_NAME}_dev_mongodb
43+
container_name: ${PACKAGE_NAME}_mongodb
4544
restart: unless-stopped
4645
environment:
4746
MONGO_INITDB_DATABASE: ${PACKAGE_NAME}_db
@@ -59,7 +58,7 @@ services:
5958

6059
mongo-express:
6160
image: mongo-express
62-
container_name: ${PACKAGE_NAME}_dev_mongo_express
61+
container_name: ${PACKAGE_NAME}_mongo_express
6362
restart: unless-stopped
6463
environment:
6564
ME_CONFIG_MONGODB_SERVER: mongodb
@@ -75,10 +74,9 @@ services:
7574
mongodb:
7675
condition: service_healthy
7776

78-
redis-master:
79-
profiles: ['dev', 'prod']
80-
image: redis
81-
container_name: ${PACKAGE_NAME}_redis-master
77+
redis:
78+
image: redis:8
79+
container_name: ${PACKAGE_NAME}_redis
8280
command:
8381
[
8482
'redis-server',
@@ -90,35 +88,14 @@ services:
9088
'no',
9189
]
9290
ports:
93-
- '22376:6379'
91+
- '127.0.0.1:6379:6379'
9492
healthcheck:
9593
test: ['CMD', 'redis-cli', 'ping']
9694
interval: 5s
9795
timeout: 3s
9896
retries: 5
9997
restart: always
10098

101-
redis-replica:
102-
profiles: ['prod']
103-
image: redis
104-
container_name: ${PACKAGE_NAME}_redis-replica
105-
command:
106-
[
107-
'redis-server',
108-
'--replicaof',
109-
'redis-master',
110-
'6379',
111-
'--bind',
112-
'0.0.0.0',
113-
'--protected-mode',
114-
'no',
115-
]
116-
ports:
117-
- '22377:6379'
118-
depends_on:
119-
- redis-master
120-
restart: always
121-
12299
volumes:
123100
mongodb_data:
124101
files-data:

‎src/lib/chat/chat.gateway.ts‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)