Merge pull request #9 from mizanmahi/dev

Dev
mizanmahi · Oct 7, 2024 · d45775a · d45775a
2 parents 36f7bd3 + 869e286
commit d45775a
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 6 deletions.
diff --git a/.env.example b/.env.example
@@ -2,6 +2,7 @@ NODE_ENV="development"
 PORT=5000
 
 # DATABASE_URL="postgresql://postgres:123456@localhost:5432/mydb?blogdb=public"
+# DATABASE_URL=postgresql://postgres:nextblogrds@db-nextblog.c72qycyeiylo.ap-southeast-1.rds.amazonaws.com:5432/nextblog -> aws rds
 DATABASE_URL="your database url"
 
 

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,7 +3,8 @@ name: Build, Push, and Deploy Docker Image to EC2
 on:
    push:
       branches:
-         - main # Trigger the workflow on push to the main branch
+         - main
+         - dev # Trigger the workflow on push to the dev branch
 
 jobs:
    build_and_deploy:
@@ -24,12 +25,12 @@ jobs:
          # Step 3: Build the Docker image
          - name: Build Docker image
            run: |
-              docker build -t ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:3.0 .
+              docker build -t ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:7.0 .
 
          # Step 4: Push Docker image to DockerHub
          - name: Push Docker image
            run: |
-              docker push ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:3.0
+              docker push ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:7.0
 
          # Step 5: SSH to EC2 and deploy the Docker container
          - name: Deploy to EC2
@@ -41,7 +42,7 @@ jobs:
               port: 22
               script: |
                  # Pull the latest image
-                 sudo docker pull ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:3.0
+                 sudo docker pull ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:7.0
 
                  # Check if the container is running and stop/remove it if it exists
                  if [ "$(sudo docker ps -a -q -f name=nextblog)" ]; then
@@ -57,4 +58,4 @@ jobs:
 
                  # Run the container
                  echo "Starting a new container..."
-                 sudo docker run -d --name nextblog --env-file .env -p 9000:5000 ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:3.0
+                 sudo docker run -d --name nextblog --env-file .env -p 9000:5000 ${{ secrets.DOCKERHUB_USER_NAME }}/nextblog:7.0
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ node_modules
 
 .vercel
 
+dist
diff --git a/Dockerfile b/Dockerfile
@@ -17,4 +17,4 @@ COPY . .
 EXPOSE 5000
 
 # Define the command to run your application.
-CMD ["sh", "-c", "npx prisma generate && npx prisma migrate deploy && yarn build && yarn start"]
+CMD ["sh", "-c", "yarn migrate && yarn build && yarn start"]
diff --git a/src/app/middlewares/globalErrorHandler.ts b/src/app/middlewares/globalErrorHandler.ts
@@ -17,3 +17,8 @@ const globalErrorHandler = (
 };
 
 export default globalErrorHandler;
+
+
+
+
+
diff --git a/src/app/modules/User/user.constant.ts → src/app/modules/user/user.constant.ts b/src/app/modules/User/user.constant.ts → src/app/modules/user/user.constant.ts
diff --git a/src/app/modules/User/user.controller.ts → src/app/modules/user/user.controller.ts b/src/app/modules/User/user.controller.ts → src/app/modules/user/user.controller.ts
diff --git a/src/app/modules/User/user.interface.ts → src/app/modules/user/user.interface.ts b/src/app/modules/User/user.interface.ts → src/app/modules/user/user.interface.ts
diff --git a/src/app/modules/User/user.routes.ts → src/app/modules/user/user.routes.ts b/src/app/modules/User/user.routes.ts → src/app/modules/user/user.routes.ts
diff --git a/src/app/modules/User/user.service.ts → src/app/modules/user/user.service.ts b/src/app/modules/User/user.service.ts → src/app/modules/user/user.service.ts
diff --git a/...app/modules/User/user.validationSchema.ts → ...app/modules/user/user.validationSchema.ts b/...app/modules/User/user.validationSchema.ts → ...app/modules/user/user.validationSchema.ts
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,3 +17,8 @@ const globalErrorHandler = (
		};

		export default globalErrorHandler;