From c14d88a4cb16ca427f16dc9113f7c041b63c917b Mon Sep 17 00:00:00 2001
From: Rajesh kumar mishra <mishra.rajesh674@gmail.com>
Date: Thu, 11 Jul 2024 11:11:34 +0530
Subject: [PATCH 1/5] Create dockerfile

---
 dockerfile | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 dockerfile

diff --git a/dockerfile b/dockerfile
new file mode 100644
index 000000000..81abe2250
--- /dev/null
+++ b/dockerfile
@@ -0,0 +1,5 @@
+FORM ubuntu
+RUN apt update
+RUN apt install apache2 -y
+ADD . /var/www/html
+ENTRYPOINT apachectl -D FOREGROUND

From 321ec797db54f04350b57a60361965e5b2a856d8 Mon Sep 17 00:00:00 2001
From: Rajesh kumar mishra <mishra.rajesh674@gmail.com>
Date: Fri, 12 Dec 2025 22:28:08 +0530
Subject: [PATCH 2/5] Update CI workflow from Jekyll to Next.js

---
 .github/workflows/docker.yml | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
new file mode 100644
index 000000000..ffecb0bd6
--- /dev/null
+++ b/.github/workflows/docker.yml
@@ -0,0 +1,46 @@
+name: Next.js CI/CD
+
+on:
+  push:
+    branches: [ "master" ]  # use master branch
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+    # 1️⃣ Checkout the repo
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    # 2️⃣ Setup Node.js
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: 20
+
+    # 3️⃣ Install dependencies
+    - name: Install dependencies
+      run: npm install --legacy-peer-deps
+
+    # 4️⃣ Build Next.js project
+    - name: Build Next.js
+      run: npm run build
+
+    # 5️⃣ Deploy to your server via SSH
+    - name: Deploy via SSH
+      uses: appleboy/ssh-action@v0.1.9
+      with:
+        host: ${{ secrets.SERVER_IP }}
+        username: ${{ secrets.SERVER_USER }}
+        key: ${{ secrets.SERVER_SSH_KEY }}
+        port: 22
+        script: |
+          cd /var/www/rajeshmishrafrontend.xyz/nextjs/website
+          git reset --hard
+          git pull origin master
+          npm install --legacy-peer-deps
+          npm run build
+          pm2 restart nextjs-website

From f7f7dedf73c147a37611711d28dcc239869623be Mon Sep 17 00:00:00 2001
From: Rajesh Mishra <rajesh.mishra@mavenark.co.in>
Date: Fri, 12 Dec 2025 22:36:12 +0530
Subject: [PATCH 3/5] test

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ffecb0bd6..a4e29117b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,7 +38,7 @@ jobs:
         key: ${{ secrets.SERVER_SSH_KEY }}
         port: 22
         script: |
-          cd /var/www/rajeshmishrafrontend.xyz/nextjs/website
+          cd /var/www/rajeshmishrafrontend.xyz/website
           git reset --hard
           git pull origin master
           npm install --legacy-peer-deps

From 94de4d9f371cdc07a0abb4ed001b1e1d9adb54c7 Mon Sep 17 00:00:00 2001
From: Rajesh Mishra <rajesh.mishra@mavenark.co.in>
Date: Fri, 12 Dec 2025 22:51:16 +0530
Subject: [PATCH 4/5] CI

---
 .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..63c3e3046
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,33 @@
+name: Next.js CI (develop → master)
+
+on:
+  pull_request:
+    branches: [ "master" ]
+    types: [opened, synchronize, reopened]
+    # Only trigger if PR comes from develop branch
+    paths-ignore:
+      - "README.md"
+
+jobs:
+  build:
+    if: github.base_ref == 'master' && github.head_ref == 'develop'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Build Next.js App
+        run: npm run build
+
+      - name: Run Tests (optional)
+        run: npm test
+        continue-on-error: true

From 96b62dcaa6b469aeb8d87f22b6b33e56d9927918 Mon Sep 17 00:00:00 2001
From: Rajesh Mishra <rajesh.mishra@mavenark.co.in>
Date: Sat, 13 Dec 2025 18:36:16 +0530
Subject: [PATCH 5/5] CI

---
 .github/workflows/docker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a4e29117b..175f3b994 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,7 +38,7 @@ jobs:
         key: ${{ secrets.SERVER_SSH_KEY }}
         port: 22
         script: |
-          cd /var/www/rajeshmishrafrontend.xyz/website
+          cd /var/www/myproject/website
           git reset --hard
           git pull origin master
           npm install --legacy-peer-deps