From eb943b76e0d78b153dd70250669e1a22abdee986 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sat, 20 Sep 2025 19:18:03 +0530 Subject: [PATCH 1/9] Update Dockerfile with tests From c04ac45fec75dd22ccbefccc54a2fd384c389799 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sat, 20 Sep 2025 20:35:06 +0530 Subject: [PATCH 2/9] Update .env.docker --- frontend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.docker b/frontend/.env.docker index 2451e5960..ef1011a12 100644 --- a/frontend/.env.docker +++ b/frontend/.env.docker @@ -1 +1 @@ -VITE_API_PATH="http://34.213.249.66:31100" +VITE_API_PATH="http://wanderlust.logicleaf.in:31100" From 67494194e701462938d96c81a52aa8cf740adadc Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sat, 20 Sep 2025 21:49:38 +0530 Subject: [PATCH 3/9] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 50b6e9709..5544d42bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: env_file: - ./backend/.env.docker ports: - - "5000:5000" + - "31100:5000" depends_on: - mongodb From 9b5a3e577d7b9595425aed58859fa9ee9d5271fa Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sat, 20 Sep 2025 21:57:00 +0530 Subject: [PATCH 4/9] Update .env.docker --- frontend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.docker b/frontend/.env.docker index ef1011a12..bf9640702 100644 --- a/frontend/.env.docker +++ b/frontend/.env.docker @@ -1 +1 @@ -VITE_API_PATH="http://wanderlust.logicleaf.in:31100" +VITE_API_PATH="http://wanderlust.logicleaf.in:5000" From ad2949aca978017401910b81263f6a2513fba854 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sun, 21 Sep 2025 20:16:45 +0530 Subject: [PATCH 5/9] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5544d42bd..50b6e9709 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: env_file: - ./backend/.env.docker ports: - - "31100:5000" + - "5000:5000" depends_on: - mongodb From b3c6d0d592f16fb3b175897ba2d9531187f0c4d1 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:29:41 +0530 Subject: [PATCH 6/9] Update docker-compose.yml --- docker-compose.yml | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 50b6e9709..ef3743381 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,39 +1,50 @@ version: "3.8" + services: mongodb: - container_name: mongo image: mongo:latest + container_name: mongo volumes: - ./backend/data:/data ports: - "27017:27017" + networks: + - backend-network + + redis: + image: redis:7.0.5-alpine + container_name: redis + restart: unless-stopped + expose: + - 6379 + networks: + - backend-network backend: - container_name: backend build: ./backend + container_name: backend env_file: - ./backend/.env.docker ports: - "5000:5000" depends_on: - mongodb + - redis + networks: + - backend-network frontend: - container_name: frontend build: ./frontend + container_name: frontend env_file: - ./frontend/.env.docker ports: - "5173:5173" - - redis: - container_name: redis - restart: unless-stopped - image: redis:7.0.5-alpine - expose: - - 6379 - depends_on: - - mongodb + networks: + - backend-network volumes: data: + +networks: + backend-network: From 0c1f42e7cdb47d504282e4aeee6686f36293dba7 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sun, 21 Sep 2025 21:34:20 +0530 Subject: [PATCH 7/9] Update .env.docker --- backend/.env.docker | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/.env.docker b/backend/.env.docker index 7c60b83da..d70a4c4c2 100644 --- a/backend/.env.docker +++ b/backend/.env.docker @@ -1,10 +1,11 @@ -MONGODB_URI="mongodb://mongo-service/wanderlust" -REDIS_URL="redis://redis-service:6379" +MONGODB_URI="mongodb://mongodb:27017/wanderlust" +REDIS_URL="redis://redis:6379" PORT=8080 -FRONTEND_URL="http://34.213.249.66:5173" +FRONTEND_URL="http://3.80.120.116:5173" ACCESS_COOKIE_MAXAGE=120000 ACCESS_TOKEN_EXPIRES_IN='120s' REFRESH_COOKIE_MAXAGE=120000 REFRESH_TOKEN_EXPIRES_IN='120s' JWT_SECRET=70dd8b38486eee723ce2505f6db06f1ee503fde5eb06fc04687191a0ed665f3f98776902d2c89f6b993b1c579a87fedaf584c693a106f7cbf16e8b4e67e9d6df NODE_ENV=Development + From 9cffac54d7114eb4d170bcd9e2f7212c0fae2a9b Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sun, 21 Sep 2025 22:05:27 +0530 Subject: [PATCH 8/9] Update .env.docker --- backend/.env.docker | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/.env.docker b/backend/.env.docker index d70a4c4c2..e4b6fc804 100644 --- a/backend/.env.docker +++ b/backend/.env.docker @@ -1,6 +1,6 @@ MONGODB_URI="mongodb://mongodb:27017/wanderlust" REDIS_URL="redis://redis:6379" -PORT=8080 +PORT=5000 FRONTEND_URL="http://3.80.120.116:5173" ACCESS_COOKIE_MAXAGE=120000 ACCESS_TOKEN_EXPIRES_IN='120s' From e68450557a2e5856eece614937e7db63585a3bb7 Mon Sep 17 00:00:00 2001 From: Sufiyan12421 <157584300+Sufiyan12421@users.noreply.github.com> Date: Sun, 21 Sep 2025 23:51:13 +0530 Subject: [PATCH 9/9] Create Jenkinsfile1 --- Jenkinsfile1 | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 Jenkinsfile1 diff --git a/Jenkinsfile1 b/Jenkinsfile1 new file mode 100644 index 000000000..301cb611f --- /dev/null +++ b/Jenkinsfile1 @@ -0,0 +1,81 @@ +pipeline { + agent any + environment { + SONAR_HOME = tool "Sonar" + } + stages { + stage("Clone Code from GitHub") { + steps { + git url: "https://github.com/Sufiyan12421/Wanderlust-Mega-Project.git", branch: "main" + } + } + + stage("SonarQube Quality Analysis") { + steps { + withSonarQubeEnv("Sonar") { + sh """ + $SONAR_HOME/bin/sonar-scanner \ + -Dsonar.projectKey=wanderlust \ + -Dsonar.projectName=wanderlust + """ + } + } + } + + stage("OWASP Dependency Check") { + steps { + dependencyCheck additionalArguments: '--scan ./', odcInstallation: 'dc' + dependencyCheckPublisher pattern: '**/dependency-check-report.xml' + } + } + + stage("Sonar Quality Gate Scan") { + steps { + timeout(time: 2, unit: "MINUTES") { + waitForQualityGate abortPipeline: false + } + } + } + + stage("Trivy File System Scan") { + steps { + sh "trivy fs ./ --format table -o trivy-fs-report.html" + archiveArtifacts artifacts: 'trivy-fs-report.html', allowEmptyArchive: true + } + } + + stage("Deploy Using Docker Compose") { + steps { + sh ''' + # Detect docker-compose command (v1 vs v2) + if command -v docker-compose >/dev/null 2>&1; then + COMPOSE_CMD="docker-compose" + else + COMPOSE_CMD="docker compose" + fi + + echo "Using compose command: $COMPOSE_CMD" + + # Stop and remove all old containers, networks, volumes for this compose project + $COMPOSE_CMD down --remove-orphans || true + + # Remove any stale backend container by name (just in case) + docker rm -f backend || true + + # Pull latest images + $COMPOSE_CMD pull + + # Build fresh images without cache + $COMPOSE_CMD build --no-cache + + # Start services in detached mode, recreating containers + $COMPOSE_CMD up -d --force-recreate + + # Capture logs from backend only (or all if you want) + $COMPOSE_CMD logs backend > backend-logs.txt || true + ''' + archiveArtifacts artifacts: 'backend-logs.txt', allowEmptyArchive: true + } + } + } +}