test3

.github/workflows/build.yml

@@ -1,25 +1,25 @@
-name: Build on PR
-
-on:
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: '20'
-
-      - name: Install Dependencies
-        run: npm install
-      
-      - name: Generate prisma client
-        run: npm run db:generate
-
-      - name: Run Build
-        run: npm run build
+name: Build on PR
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+      
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Generate prisma client
+        run: npm run db:generate
+        
+      - name: Run Build
+        run: npm run user-build

.github/workflows/deploy.yml

@@ -1,42 +1,43 @@
-name: Build and Deploy to Docker Hub
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Check Out Repo
-      uses: actions/checkout@v2
-
-    - name: Log in to Docker Hub
-      uses: docker/login-action@v1
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Build and Push Docker image
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./docker/Dockerfile.user
-        push: true
-        tags: 100xdevs/week-18-class:latest  # Replace with your Docker Hub username and repository
-
-    - name: Verify Pushed Image
-      run: docker pull 100xdevs/week-18-class:latest  # Replace with your Docker Hub username and repository
-
-    - name: Deploy to EC2
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.SSH_HOST }}
-        username: ${{ secrets.SSH_USERNAME }}
-        key: ${{ secrets.SSH_KEY }}
-        script: |
-          sudo docker pull 100xdevs/week-18-class:latest
-          sudo docker stop web-app || true
-          sudo docker rm web-app || true
-          sudo docker run -d --name web-app -p 3005:3000 100xdevs/week-18-class:latest
+name: Build and Deploy to Docker Hub
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check Out Repo
+      uses: actions/checkout@v2
+
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Build and Push Docker image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        file: ./docker/Dockerfile.user
+        push: true
+        tags: jiteshrajoriya/week-18-class:latest  
+
+    - name: Verify Pushed Image
+      run: docker pull jiteshrajoriya/week-18-class:latest  
+
+
+    - name: Deploy to EC2
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.SSH_HOST }}
+        username: ${{ secrets.SSH_USERNAME }}
+        key: ${{ secrets.SSH_KEY }}
+        script: |
+          sudo docker pull jiteshrajoriya/week-18-class:latest
+          sudo docker stop week-18-class || true
+          sudo docker rm week-18-class || true
+          sudo docker run -d --name week-18-class -p 3005:3000 jiteshrajoriya/week-18-class:latest

docker/Dockerfile.user

@@ -1,18 +1,14 @@
-FROM node:20.12.0-alpine3.19
-
-WORKDIR /usr/src/app
-
-COPY package.json package-lock.json turbo.json tsconfig.json ./
-
-COPY apps ./apps
-COPY packages ./packages
-
-# Install dependencies
-RUN npm install
-# Can you add a script to the global package.json that does this?
-RUN npm run db:generate
-
-# Can you filter the build down to just one app?
-RUN npm run build
-
+FROM node:20.12.0-alpine3.19
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json turbo.json tsconfig.json ./
+
+COPY apps ./apps
+COPY packages ./packages
+
+RUN npm install
+RUN npm run db:generate
+RUN npm run user-build
+
 CMD ["npm", "run", "start-user-app"]

package.json

@@ -7,7 +7,8 @@
     "lint": "turbo lint",
     "format": "prettier --write \"**/*.{ts,tsx,md}\"",
     "db:generate": "cd packages/db && npx prisma generate && cd ../..",
-    "start-user-app": "cd ./apps/user-app && npm run start"
+    "start-user-app": "cd ./apps/user-app && npm run start",
+    "user-build": "cd ./apps/user-app && npm run build && cd ../.."
 
   },
   "devDependencies": {