Merge pull request #9 from samagra-comms/main

Bring dev up to par with main

Author: KDwevedi

.env.sample

@@ -0,0 +1,16 @@
+APP_PORT=80
+
+#Supabase: Database
+SUPABASE_URL=''
+## This is Service Key, disables RLS
+SUPABASE_KEY=''
+## Adapter Config
+BASE_URL=''
+ADAPTER_ADMIN_TOKEN=""
+VAULT_SERVICE_URL=''
+VAULT_SERVICE_TOKEN=''
+GUPSHUP_API_ENDPOINT=''
+
+## Orchestrator
+ORCHESTRATOR_API_ENDPOINT=''
+ORCHESTRATOR_FEEDBACK_ENDPOINT=''

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

@@ -0,0 +1,47 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - dev
+      - prod
+
+env:
+  DOCKER_USERNAME: ${{ github.actor }}
+  DOCKER_IMAGE_NAME: ${{ github.repository }}
+  DOCKER_REGISTRY: ghcr.io
+  DOCKER_IMAGE_TAG: ${{ github.ref_name }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - id: lower-repo
+        shell: pwsh
+        run: |
+          "::set-output name=repository::$($env:DOCKER_IMAGE_NAME.ToLowerInvariant())"
+          
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to Docker registry
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ env.DOCKER_USERNAME }}
+          password: ${{ secrets.PAT }}
+
+      - name: Build and Push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          build-args: |
+            "SERVER_RELEASE_VERSION=${{ github.sha }}"
+          context: .
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ${{ env.DOCKER_REGISTRY }}/${{ steps.lower-repo.outputs.repository }}:${{env.DOCKER_IMAGE_TAG}}
+          labels: org.opencontainers.image.source=https://github.com/${{steps.lower-repo.outputs.repository}}

.github/workflows/docker-image.yml

@@ -0,0 +1,18 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ "prod" ]
+  pull_request:
+    branches: [ "dev" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)

Dockerfile

@@ -1,13 +1,33 @@
-FROM node:21-bullseye
-
-RUN apt-get -q update
+# Stage 1: Build the application
+FROM node:18-bullseye AS builder
 
 WORKDIR /app
 
-COPY . .
+# Copy package.json and yarn.lock files
+COPY package.json yarn.lock ./
 
+# Install dependencies
 RUN yarn install
 
+# Copy the rest of the application source code
+COPY . .
+
+# Build the application
 RUN yarn build
 
-ENTRYPOINT [ "yarn", "start:prod" ]
+# Stage 2: Create the run-time image
+FROM node:18-bullseye
+
+WORKDIR /app
+
+# Copy the built application from the previous stage
+COPY --from=builder /app/node_modules ./node_modules
+COPY --from=builder /app/dist ./dist
+COPY --from=builder /app/package.json ./
+COPY --from=builder /app/yarn.lock ./
+
+ARG SERVER_RELEASE_VERSION
+ENV SERVER_RELEASE_VERSION=${SERVER_RELEASE_VERSION}
+
+# Set the entrypoint to start the application
+ENTRYPOINT [ "yarn", "start:prod" ]

src/message/message.module.ts

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { MessageController } from './controllers/inbound.message.controller';
 import { InboundService } from './services/inbound/inbound.service';
-// import { SupabaseService } from './services/supabase.service';
 import { ConfigModule } from '@nestjs/config';
 import { OutboundService } from './services/outbound/outbound.service';