From 7cedf9e5726c0a387bae7827d8fdc7ceda756f61 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 11:14:45 +0530
Subject: [PATCH 01/24] Create docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
new file mode 100644
index 0000000..e21fe11
--- /dev/null
+++ b/.github/workflows/docker-image.yml
@@ -0,0 +1,21 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Docker Login
+      uses: docker/login-action@v1
+      with:
+        username:
+        password:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker compose build
+  
+  

From 97dedea9bd180d78f54793c613df07998cf9ed96 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:55:22 +0530
Subject: [PATCH 02/24] Update docker-compose.yaml

---
 docker-compose.yaml | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 8ee650f..6fe1f2a 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,23 +12,29 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_DB: ${POSTGRES_DB}
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      interval: 10s
+      retries: 5
+      start_period: 30s
     networks:
-      - internalnet
+      - nextinternalnet
     volumes:
-      - C:/Users/promact/postgresdatabase:/var/lib/postgresql/data
+      - $HOME/postgresdatabase:/var/lib/postgresql/data
 
   nextjsapp:
     build:
       context: ./
       dockerfile: Dockerfile
-    image: nextjsapp:1.0
+    image: jainilp12/nextjsapp:1.0
     expose:
       - ${SERVER_PORT}
     ports:
-      - 3000:${SERVER_PORT}
+      - 80:${SERVER_PORT}
     command: >
-      sh -c "npx prisma db push
-            npm run dev"
+      sh -c "
+      npm run start"
+
     environment:
       DATABASE_URL: ${REMOTE_DATABASE_URL}
       AUTH0_SECRET: ${AUTH0_SECRET}
@@ -36,11 +42,13 @@ services:
       AUTH0_ISSUER_BASE_URL: ${AUTH0_ISSUER_BASE_URL}
       AUTH0_CLIENT_ID: ${AUTH0_CLIENT_ID}
       AUTH0_CLIENT_SECRET: ${AUTH0_CLIENT_SECRET}
+
     depends_on:
-      - postgresdb
+      postgresdb:
+        condition: service_healthy
     networks:
-      - internalnet
+      - nextinternalnet
 
 networks:
-  internalnet:
-    driver: bridge
\ No newline at end of file
+  nextinternalnet:
+    driver: bridge

From 6d317bb5cf4db0b23a41dfb17f3ec46661b7857e Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:55:45 +0530
Subject: [PATCH 03/24] Update Dockerfile

---
 Dockerfile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7bc5e65..2f676da 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,18 @@
-FROM node:latest
+FROM node:20-alpine AS builder
 WORKDIR /app
 COPY package.json ./
 RUN npm install
-
 COPY . .
+RUN npx prisma generate
+RUN npm run build
+RUN npm prune --production
+# --omit=dev
+
+
+FROM node:20-alpine
+WORKDIR /app
+COPY --from=builder /app/package.json ./package.json
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/.next ./.next
+COPY --from=builder /app/public ./public
 EXPOSE 3000
-RUN npx prisma generate
\ No newline at end of file

From 97874597f20d5b6340d751cf0d478accd50b57c3 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 14:56:49 +0530
Subject: [PATCH 04/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 67 ++++++++++++++++++++++++------
 1 file changed, 54 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e21fe11..173f50e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,20 +2,61 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ "master" ]
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
 
 jobs:
   build:
-    - name: Checkout code
-      uses: actions/checkout@v3
+    runs-on: ubuntu-latest
+    steps:
+      - name: Docker Checkout
+        uses: actions/checkout@v3
 
-    - name: Docker Login
-      uses: docker/login-action@v1
-      with:
-        username:
-        password:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker compose build
-  
-  
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and Push
+        env:
+          SERVER_PORT: ${{ secrets.SERVER_PORT }}
+        run: |
+          docker compose build
+          docker compose push
+
+      - name: copy file via ssh password
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.AWS_HOST }}
+          username: ${{ secrets.AWS_USERNAME }}
+          key: ${{ secrets.AWS_KEYPAIR }}
+          source: "docker-compose.yaml"
+          target: "/home/ubuntu/"
+
+      - name: SSH to AWS Instance and Pull Image
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.AWS_HOST }}
+          username: ${{ secrets.AWS_USERNAME }}
+          key: ${{ secrets.AWS_KEYPAIR }}
+          script: |
+            touch .env
+            echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
+            echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
+            echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
+            echo "NEXT_PORT=${{ secrets.NEXT_PORT }}" >> .env
+            echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
+            echo "HOME=${{ secrets.HOME }}" >> .env
+            echo "SERVER_PORT=${{ secrets.SERVER_PORT }}" >> .env
+            echo "AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}" >> .env
+            echo "AUTH0_BASE_URL=${{ secrets.AUTH0_BASE_URL }}" >> .env
+            echo "AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}" >> .env
+            echo "AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}" >> .env
+            echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
+            echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
+            echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
+            sudo docker compose pull
+            sudo docker compose down || true
+            sudo docker compose up -d

From 90245ab260dab6f3675c91f2ef509bef3452cdcc Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 15:54:52 +0530
Subject: [PATCH 05/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 173f50e..720b596 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -21,7 +21,20 @@ jobs:
 
       - name: Build and Push
         env:
+          POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
+          POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
+          POSTGRES_DB: ${{ secrets.POSTGRES_DB }}
+          NEXT_PORT: ${{ secrets.NEXT_PORT }}
+          DB_NAME: ${{ secrets.DB_NAME }}
+          HOME: ${{ secrets.HOME }}
           SERVER_PORT: ${{ secrets.SERVER_PORT }}
+          AUTH0_SECRET: ${{ secrets.AUTH0_SECRET }}
+          AUTH0_BASE_URL: ${{ secrets.AUTH0_BASE_URL }}
+          AUTH0_ISSUER_BASE_URL: ${{ secrets.AUTH0_ISSUER_BASE_URL }}
+          AUTH0_CLIENT_ID: ${{ secrets.AUTH0_CLIENT_ID }}
+          AUTH0_CLIENT_SECRET: ${{ secrets.AUTH0_CLIENT_SECRET }}
+          LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
+          REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
           docker compose build
           docker compose push

From 27c524872750ef14f4374e98139569732b01d37f Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:02:32 +0530
Subject: [PATCH 06/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 720b596..700dead 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: ["master"]
   pull_request:
-    branches: ["master"]
+    branches: [ "master" ]
 
 jobs:
   build:

From 30be0c6b594359decc9ae61da8ab9929ee2ee8ed Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:37:25 +0530
Subject: [PATCH 07/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 700dead..e683cbb 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -36,8 +36,8 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
-          docker compose build
-          docker compose push
+          sudo docker compose build
+          sudo docker compose push
 
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7

From f8d16600b39080f252320e8a7b4daf352ccb594f Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:38:50 +0530
Subject: [PATCH 08/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e683cbb..700dead 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -36,8 +36,8 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
-          sudo docker compose build
-          sudo docker compose push
+          docker compose build
+          docker compose push
 
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7

From f67ab558415d7235d27838b49684643661a43146 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:45:11 +0530
Subject: [PATCH 09/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 700dead..16d816b 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -36,8 +36,23 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
-          docker compose build
-          docker compose push
+          touch .env
+          echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
+          echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
+          echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
+          echo "NEXT_PORT=${{ secrets.NEXT_PORT }}" >> .env
+          echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
+          echo "HOME=${{ secrets.HOME }}" >> .env
+          echo "SERVER_PORT=${{ secrets.SERVER_PORT }}" >> .env
+          echo "AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}" >> .env
+          echo "AUTH0_BASE_URL=${{ secrets.AUTH0_BASE_URL }}" >> .env
+          echo "AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}" >> .env
+          echo "AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}" >> .env
+          echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
+          echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
+          echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
+          sudo docker compose build
+          sudo docker compose push
 
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7

From 21b857e1a4b216ef60c016a28ebf8c937f467880 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:49:33 +0530
Subject: [PATCH 10/24] Update docker-compose.yaml

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6fe1f2a..37f8bd7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -26,7 +26,7 @@ services:
     build:
       context: ./
       dockerfile: Dockerfile
-    image: jainilp12/nextjsapp:1.0
+    image: jainilp12/nextapp:1.0
     expose:
       - ${SERVER_PORT}
     ports:

From 2491e3383c1a1e9984c163b4ea09142876e6dfed Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 16:56:42 +0530
Subject: [PATCH 11/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 16d816b..63059f3 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,8 +16,8 @@ jobs:
       - name: Docker Login
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: "jainilp12"
+          password: "Jainil@115"
 
       - name: Build and Push
         env:

From cf49674f6185d12ca7e167e39c3bb43b6015ccef Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:15:44 +0530
Subject: [PATCH 12/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 63059f3..2c37aba 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -37,7 +37,7 @@ jobs:
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
           touch .env
-          echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
+          echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" > .env
           echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
           echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
           echo "NEXT_PORT=${{ secrets.NEXT_PORT }}" >> .env
@@ -71,7 +71,7 @@ jobs:
           key: ${{ secrets.AWS_KEYPAIR }}
           script: |
             touch .env
-            echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" >> .env
+            echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" > .env
             echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
             echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
             echo "NEXT_PORT=${{ secrets.NEXT_PORT }}" >> .env

From 312c8488cbcfe022d7cbeec68c47629a8b83afec Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:17:34 +0530
Subject: [PATCH 13/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2c37aba..4214442 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -36,6 +36,7 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
+          docker login -u jainilp12 -p "Jainil@115"
           touch .env
           echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" > .env
           echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env

From 7574e321cd45f2e011b30c5d2bdc2a0eaef1a543 Mon Sep 17 00:00:00 2001
From: Soumya <saumyadas2017@gmail.com>
Date: Wed, 6 Mar 2024 17:23:30 +0530
Subject: [PATCH 14/24] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 73ea1f0..d9e73fb 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ You can start editing the page by modifying `app/page.tsx`. The page auto-update
 
 This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font.
 
-## Learn More
+## Learn More 
 
 To learn more about Next.js, take a look at the following resources:
 

From 8d49058bd506f5f56dddba41b5eed16c2acfb9ab Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:36:56 +0530
Subject: [PATCH 15/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4214442..1829b8f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -17,7 +17,7 @@ jobs:
         uses: docker/login-action@v3
         with:
           username: "jainilp12"
-          password: "Jainil@115"
+          password: "dckr_pat_9hr3Icx6IZ_qtyY6fFFXyIJDkUc"
 
       - name: Build and Push
         env:
@@ -36,7 +36,6 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
-          docker login -u jainilp12 -p "Jainil@115"
           touch .env
           echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" > .env
           echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env

From 52dbe62f579de4e3fd36a8098b7ac8adcdb22da3 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:40:48 +0530
Subject: [PATCH 16/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 1829b8f..42111d1 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -16,8 +16,8 @@ jobs:
       - name: Docker Login
         uses: docker/login-action@v3
         with:
-          username: "jainilp12"
-          password: "dckr_pat_9hr3Icx6IZ_qtyY6fFFXyIJDkUc"
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and Push
         env:

From 5a80c18dbbba3f0a63b6390468f2bbb051445872 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:51:21 +0530
Subject: [PATCH 17/24] Update docker-compose.yaml

---
 docker-compose.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 37f8bd7..11c2d4f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -22,11 +22,11 @@ services:
     volumes:
       - $HOME/postgresdatabase:/var/lib/postgresql/data
 
-  nextjsapp:
+  nextapp:
     build:
       context: ./
       dockerfile: Dockerfile
-    image: jainilp12/nextapp:1.0
+    image: jainilp12/nextapp:2.0
     expose:
       - ${SERVER_PORT}
     ports:

From 51761f3f41f1462eb6ec10d6ad2f6f6a15ba1690 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 17:58:23 +0530
Subject: [PATCH 18/24] Update docker-compose.yaml

---
 docker-compose.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 11c2d4f..5dd0e5f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.0"
 services:
   postgresdb:
     image: postgres

From 27cc60fcdb6407be7eb62883a5a6574e78b6b938 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 18:53:31 +0530
Subject: [PATCH 19/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 42111d1..0f21c4c 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -51,8 +51,8 @@ jobs:
           echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
           echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
           echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
-          sudo docker compose build
-          sudo docker compose push
+          sudo docker-compose build
+          sudo docker-compose push
 
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7

From 8459a4e98748045b5b417ae96c09cb2046046247 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 20:49:07 +0530
Subject: [PATCH 20/24] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 0f21c4c..6f3b333 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: ["master"]
+    branches: ["master" ]
   pull_request:
-    branches: [ "master" ]
+    branches: ["master"]
 
 jobs:
   build:
@@ -36,23 +36,9 @@ jobs:
           LOCAL_DATABASE_URL: ${{ secrets.LOCAL_DATABASE_URL }}
           REMOTE_DATABASE_URL: ${{ secrets.REMOTE_DATABASE_URL }}
         run: |
-          touch .env
-          echo "POSTGRES_PASSWORD=${{ secrets.POSTGRES_PASSWORD }}" > .env
-          echo "POSTGRES_USER=${{ secrets.POSTGRES_USER }}" >> .env
-          echo "POSTGRES_DB=${{ secrets.POSTGRES_DB }}" >> .env
-          echo "NEXT_PORT=${{ secrets.NEXT_PORT }}" >> .env
-          echo "DB_NAME=${{ secrets.DB_NAME }}" >> .env
-          echo "HOME=${{ secrets.HOME }}" >> .env
-          echo "SERVER_PORT=${{ secrets.SERVER_PORT }}" >> .env
-          echo "AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}" >> .env
-          echo "AUTH0_BASE_URL=${{ secrets.AUTH0_BASE_URL }}" >> .env
-          echo "AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}" >> .env
-          echo "AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}" >> .env
-          echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
-          echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
-          echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
-          sudo docker-compose build
-          sudo docker-compose push
+          docker compose build
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker compose push
 
       - name: copy file via ssh password
         uses: appleboy/scp-action@v0.1.7

From 0419aa336f1ee69b196d9df440df17fd4b23485c Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 21:00:01 +0530
Subject: [PATCH 21/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 6f3b333..ccb37bc 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -71,6 +71,7 @@ jobs:
             echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
             echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
             echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
+            sudo docker compose down || true
             sudo docker compose pull
             sudo docker compose down || true
             sudo docker compose up -d

From 7353f849e0336f8c3e0d5588249f2e4abc725aa8 Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 21:44:33 +0530
Subject: [PATCH 22/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index ccb37bc..cc9e78c 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -65,7 +65,7 @@ jobs:
             echo "HOME=${{ secrets.HOME }}" >> .env
             echo "SERVER_PORT=${{ secrets.SERVER_PORT }}" >> .env
             echo "AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}" >> .env
-            echo "AUTH0_BASE_URL=${{ secrets.AUTH0_BASE_URL }}" >> .env
+            echo "AUTH0_BASE_URL=http://ec2-13-233-97-162.ap-south-1.compute.amazonaws.com" >> .env
             echo "AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}" >> .env
             echo "AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}" >> .env
             echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env

From f0c78ec5d7d9ec719e1fafbf548ef90f0999248c Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Wed, 6 Mar 2024 21:53:03 +0530
Subject: [PATCH 23/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index cc9e78c..c85655e 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -65,7 +65,7 @@ jobs:
             echo "HOME=${{ secrets.HOME }}" >> .env
             echo "SERVER_PORT=${{ secrets.SERVER_PORT }}" >> .env
             echo "AUTH0_SECRET=${{ secrets.AUTH0_SECRET }}" >> .env
-            echo "AUTH0_BASE_URL=http://ec2-13-233-97-162.ap-south-1.compute.amazonaws.com" >> .env
+            echo "AUTH0_BASE_URL=http://ec2-13-233-97-162.ap-south-1.compute.amazonaws.com:3000" >> .env
             echo "AUTH0_ISSUER_BASE_URL=${{ secrets.AUTH0_ISSUER_BASE_URL }}" >> .env
             echo "AUTH0_CLIENT_ID=${{ secrets.AUTH0_CLIENT_ID }}" >> .env
             echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env

From 01ac65d8acdd8d73ff9101afacb1f20021d75b8e Mon Sep 17 00:00:00 2001
From: jainil15 <79244804+jainil15@users.noreply.github.com>
Date: Thu, 7 Mar 2024 10:47:56 +0530
Subject: [PATCH 24/24] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index c85655e..c6ec2a5 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -71,7 +71,7 @@ jobs:
             echo "AUTH0_CLIENT_SECRET=${{ secrets.AUTH0_CLIENT_SECRET }}" >> .env
             echo "LOCAL_DATABASE_URL=${{ secrets.LOCAL_DATABASE_URL }}" >> .env
             echo "REMOTE_DATABASE_URL=${{ secrets.REMOTE_DATABASE_URL }}" >> .env
-            sudo docker compose down || true
+            sudo docker compose down --rmi all --volumes || true
             sudo docker compose pull
             sudo docker compose down || true
             sudo docker compose up -d