Merge pull request #22 from cupofpython/refactor

Refactor

Author: cupofpython

.github/workflows/build-and-push.yml

@@ -1,4 +1,4 @@
-name: Build and deploy image
+name: Build and deploy images
 
 on:
   workflow_call:
@@ -12,7 +12,8 @@ on:
 
 env:
   REGISTRY: samanthamorris684
-  IMAGE_NAME: catbot
+  FRONTEND_IMAGE_NAME: catbot-frontend
+  BACKEND_IMAGE_NAME: catbot-backend
   USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
   PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}
 
@@ -36,12 +37,21 @@ jobs:
           endpoint: "demonstrationorg/default"
           install: true
 
-      - name: Build and push
+      - name: Build and push frontend
         uses: docker/build-push-action@v6
         with:
           push: true
+          file: Dockerfile.frontend
           platforms: linux/amd64
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
+          tags: ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
+
+      - name: Build and push backend
+        uses: docker/build-push-action@v6
+        with:
+          push: true
+          file: Dockerfile.backend
+          platforms: linux/amd64
+          tags: ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
 
 
 

.github/workflows/deploy-to-eks.yml

@@ -12,7 +12,8 @@ on:
 
 env:
   REGISTRY: samanthamorris684
-  IMAGE_NAME: catbot
+  FRONTEND_IMAGE_NAME: catbot-frontend
+  BACKEND_IMAGE_NAME: catbot-backend
   EKS_CLUSTER_NAME: catbot-cluster
   NAMESPACE: cat-chatbot
   AWS_REGION: us-east-1
@@ -35,5 +36,7 @@ jobs:
       - name: Deploy to EKS
         run: |
           aws eks update-kubeconfig --name ${{ env.EKS_CLUSTER_NAME }} --region ${{ env.AWS_REGION }}
-          kubectl set image deployment/server server=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.IMAGE_TAG }} -n ${{ env.NAMESPACE }}
-          kubectl rollout status deployment/server -n ${{ env.NAMESPACE }}
+          kubectl set image deployment/frontend frontend=${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:${{ inputs.IMAGE_TAG }} -n ${{ env.NAMESPACE }}
+          kubectl rollout status deployment/frontend -n ${{ env.NAMESPACE }}
+          kubectl set image deployment/backend backend=${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE_NAME }}:${{ inputs.IMAGE_TAG }} -n ${{ env.NAMESPACE }}
+          kubectl rollout status deployment/backend -n ${{ env.NAMESPACE }}

.github/workflows/scout.yml

@@ -11,7 +11,7 @@ on:
 
 env:
   REGISTRY: samanthamorris684
-  IMAGE_NAME: catbot
+  FRONTEND_IMAGE_NAME: catbot-frontend
   # Change from latest
   COMPARE_TAG: latest
   USERNAME: ${{ vars.DOCKERHUB_USERNAME }}
@@ -27,13 +27,13 @@ jobs:
           username: ${{ env.USERNAME }}
           password: ${{ env.PASSWORD }}
 
-      - name: Docker Scout
+      - name: Docker Scout (Frontend)
         id: docker-scout
         uses: docker/scout-action@v1
         with:
           command: compare
-          image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
-          to: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.COMPARE_TAG }}
+          image: ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:${{ inputs.IMAGE_TAG }}
+          to: ${{ env.REGISTRY }}/${{ env.FRONTEND_IMAGE_NAME }}:${{ env.COMPARE_TAG }}
           ignore-unchanged: true
           only-severities: critical,high
           write-comment: true

Dockerfile

@@ -0,0 +1,31 @@
+# syntax=docker/dockerfile:1
+
+# Build stage
+ARG NODE_VERSION=23.10.0
+FROM node:${NODE_VERSION}-alpine AS builder
+
+WORKDIR /usr/src/app
+
+COPY package.json package-lock.json ./
+
+# Install production dependencies only
+RUN npm ci --only=production
+
+# Copy app code
+COPY server.js ./
+
+# Runtime stage: new clean container
+FROM node:${NODE_VERSION}-alpine
+
+WORKDIR /usr/src/app
+
+# Copy production node_modules and server.js
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+COPY --from=builder /usr/src/app/server.js ./server.js
+
+# Expose backend ports
+EXPOSE 5001
+EXPOSE 5002
+
+# Start the backend
+CMD ["node", "server.js"]

Dockerfile.backend

@@ -0,0 +1,36 @@
+# syntax=docker/dockerfile:1
+
+# Build Stage
+ARG NODE_VERSION=23.10.0
+FROM node:${NODE_VERSION}-alpine AS builder
+
+WORKDIR /usr/src/app
+
+# Copy package files first (cache layer)
+COPY package.json package-lock.json ./
+
+# Install all dependencies
+RUN npm ci
+
+# Copy source files
+COPY src/ ./src
+COPY public/ ./public
+
+# Runtime Stage
+FROM node:${NODE_VERSION}-alpine
+
+WORKDIR /usr/src/app
+
+# Copy node_modules from builder
+COPY --from=builder /usr/src/app/node_modules ./node_modules
+
+# Copy app source
+COPY src/ ./src
+COPY public/ ./public
+COPY package.json package-lock.json ./
+
+# Expose the port that the app listens on
+EXPOSE 3000
+
+# Run the application
+CMD ["npm", "start"]

Dockerfile.frontend

@@ -8,19 +8,31 @@
 # database or a cache. For examples, see the Awesome Compose repository:
 # https://github.com/docker/awesome-compose
 services:
-  server:
-    container_name: server
-    command: npm run start:dev
+  frontend:
+    container_name: frontend
     depends_on:
-      - model
+      - backend
     build:
       context: .
+      dockerfile: Dockerfile.frontend
     volumes:
       - ./:/usr/src/app
     env_file:
       - .env.compose
     ports:
       - 3000:3000
+  backend:
+    container_name: backend
+    depends_on:
+      - model
+    build:
+      context: .
+      dockerfile: Dockerfile.backend
+    volumes:
+      - ./:/usr/src/app
+    env_file:
+      - .env.compose
+    ports:
       - 5002:5002
   model:
     container_name: model

compose.yaml

@@ -3,36 +3,34 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-    name: server
+    name: backend
     namespace: cat-chatbot
     labels:
         com.docker.compose.project: cat-chatbot
-        com.docker.compose.service: server
+        com.docker.compose.service: backend-service
 spec:
     replicas: 2
     selector:
         matchLabels:
             com.docker.compose.project: cat-chatbot
-            com.docker.compose.service: server
+            com.docker.compose.service: backend-service
     strategy:
         type: Recreate
     template:
         metadata:
             labels:
                 com.docker.compose.project: cat-chatbot
-                com.docker.compose.service: server
+                com.docker.compose.service: backend-service
                 com.docker.compose.network.default: "true"
         spec:
             containers:
-                - name: server
-                  image: samanthamorris684/catbot:latest
+                - name: backend
+                  image: samanthamorris684/catbot-backend:latest
                   imagePullPolicy: Always
                   env:
                     - name: NODE_ENV
                       value: "production"
                   ports:
-                    - name: app-3000
-                      containerPort: 3000
                     - name: server-5001
                       containerPort: 5001
                   resources:

out/base/server-deployment.yaml out/base/backend-deployment.yamlout/base/server-deployment.yaml renamed to out/base/backend-deployment.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: server-backend
+  name: backend-service
   namespace: cat-chatbot
 spec:
   selector:
     com.docker.compose.project: cat-chatbot
-    com.docker.compose.service: server
+    com.docker.compose.service: backend-service
   ports:
     - name: api
       port: 5001

out/base/server-backend.yaml out/base/backend-service.yamlout/base/server-backend.yaml renamed to out/base/backend-service.yaml

@@ -0,0 +1,41 @@
+#! server-deployment.yaml
+# Generated code, do not edit
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+    name: frontend
+    namespace: cat-chatbot
+    labels:
+        com.docker.compose.project: cat-chatbot
+        com.docker.compose.service: frontend-service
+spec:
+    replicas: 2
+    selector:
+        matchLabels:
+            com.docker.compose.project: cat-chatbot
+            com.docker.compose.service: frontend-service
+    strategy:
+        type: Recreate
+    template:
+        metadata:
+            labels:
+                com.docker.compose.project: cat-chatbot
+                com.docker.compose.service: frontend-service
+                com.docker.compose.network.default: "true"
+        spec:
+            containers:
+                - name: frontend
+                  image: samanthamorris684/catbot-frontend:latest
+                  imagePullPolicy: Always
+                  env:
+                    - name: NODE_ENV
+                      value: "production"
+                  ports:
+                    - name: app-3000
+                      containerPort: 3000
+                  resources:
+                    requests:
+                      cpu: "250m"
+                      memory: "1Gi"
+            imagePullSecrets:
+              - name: regcred