Bh dev

.github/workflows/build.yml

@@ -1,6 +1,21 @@
 name: Build and Push to GCP Artifact Registry
 
 on:
+  workflow_dispatch:
+    inputs:
+      target_environment:
+        description: Branch/environment name to use for image tags and GitHub environment
+        required: true
+        default: bh-dev
+        type: choice
+        options:
+          - bh-dev
+          - bh-main
+      push_image:
+        description: Push the built Docker image to Artifact Registry
+        required: true
+        default: true
+        type: boolean
   push:
     branches:
       - bh-main
@@ -16,7 +31,7 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment: ${{ github.ref_name }}
+    environment: ${{ github.event_name == 'workflow_dispatch' && inputs.target_environment || github.base_ref || github.ref_name }}
 
     steps:
       - name: Checkout repository
@@ -28,7 +43,9 @@ jobs:
           node-version: '22'
 
       - name: Install dependencies
-        run: npm install --legacy-peer-deps
+        run: |
+          rm -rf node_modules package-lock.json
+          npm install --legacy-peer-deps --include=optional --force
 
       - name: Build project
         run: npm run build
@@ -45,8 +62,8 @@ jobs:
   docker-push:
     runs-on: ubuntu-latest
     needs: build
-    if: github.event_name == 'push'
-    environment: ${{ github.ref_name }}
+    if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && inputs.push_image)
+    environment: ${{ github.event_name == 'workflow_dispatch' && inputs.target_environment || github.base_ref || github.ref_name }}
 
     permissions:
       contents: read
@@ -62,12 +79,19 @@ jobs:
       - name: Set image name and tags based on branch
         id: set-tags
         run: |
-          BRANCH="${{ github.ref_name }}"
+          if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
+            BRANCH="${{ inputs.target_environment }}"
+          else
+            BRANCH="${{ github.ref_name }}"
+          fi
+
           ENV_PREFIX=$(echo "$BRANCH" | cut -d'-' -f1)
           BUILD_TYPE=$(echo "$BRANCH" | cut -d'-' -f2)
+          BRANCH_TAG=$(echo "$BRANCH" | sed 's/\//-/g')
 
           echo "IMAGE_NAME=${{ env.BASE_IMAGE_NAME }}" >> $GITHUB_OUTPUT
           echo "BUILD_TAG=${BUILD_TYPE}" >> $GITHUB_OUTPUT
+          echo "BRANCH_TAG=${BRANCH_TAG}" >> $GITHUB_OUTPUT
           echo "LATEST_TAG=${BUILD_TYPE}-latest" >> $GITHUB_OUTPUT
 
       - name: Download build artifacts
@@ -100,7 +124,7 @@ jobs:
             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/${{ steps.set-tags.outputs.IMAGE_NAME }}:${{ steps.set-tags.outputs.LATEST_TAG }}
             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/${{ steps.set-tags.outputs.IMAGE_NAME }}:${{ steps.package-version.outputs.VERSION }}-${{ steps.set-tags.outputs.BUILD_TAG }}
             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/${{ steps.set-tags.outputs.IMAGE_NAME }}:${{ github.sha }}
+            ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/${{ steps.set-tags.outputs.IMAGE_NAME }}:${{ steps.set-tags.outputs.BRANCH_TAG }}
             ${{ secrets.GCP_REGION }}-docker.pkg.dev/${{ secrets.GCP_PROJECT_ID }}/${{ secrets.GCP_ARTIFACT_REPO }}/${{ steps.set-tags.outputs.IMAGE_NAME }}:${{ steps.set-tags.outputs.BUILD_TAG }}
           platforms: linux/amd64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          no-cache: true

.gitignore

@@ -11,6 +11,10 @@ node_modules
 dist
 dist-ssr
 *.local
+bun.lock
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
 
 # Editor directories and files
 .vscode/*

Dockerfile

@@ -1,8 +1,8 @@
 # Stage 1: Build
 FROM node:22-alpine AS build
 WORKDIR /usr/local/app
-COPY package.json package-lock.json ./
-RUN npm install --legacy-peer-deps
+COPY package.json ./
+RUN rm -f package-lock.json && npm install --legacy-peer-deps --include=optional --force
 COPY ./ ./
 RUN npm run build
 
@@ -15,4 +15,4 @@ RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 EXPOSE 8081
 CMD ["nginx", "-g", "daemon off;"]
-# docker buildx build --platform linux/amd64 -t asia-south1-docker.pkg.dev/s-0-000236-99/moa-bharatvistaar-repo/oan-ui-dev:latest --push .
+# docker buildx build --platform linux/amd64 -t asia-south1-docker.pkg.dev/s-0-000236-99/moa-bharatvistaar-repo/oan-ui-dev:latest --push .

index.html

@@ -5,9 +5,6 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" />
     <title>Bharat-VISTAAR</title>
-    <script type="text/javascript" src="js/jquery.min.js"></script>	
-    <script type="text/javascript" src="js/auth-token-generator.min.js"></script> 
-    <script type="text/javascript" src="js/telemetry.min.js"></script>
   </head>
   <body>
     <div id="root"></div>