added research assistant code

Author: Priyanka-Microsoft

.github/workflows/buid-docker-image.yml

@@ -3,30 +3,54 @@ name: Build Docker Images
 on:
   push:
     branches: [main]
+    paths:
+      - ClientAdvisor/**
+      - ResearchAssistant/**
   pull_request:
     branches: [main]
     types:
       - opened
       - ready_for_review
       - reopened
       - synchronize
+    paths:
+      - ClientAdvisor/**
+      - ResearchAssistant/**
   merge_group:
 
 jobs:
   docker-build:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         include:
           - app_name: clientadvisor-webapp
             dockerfile: ClientAdvisor/App/WebApp.Dockerfile
+            registry: pslpricicdcontainerreg.azurecr.io
+            username_secret: DOCKER_USERNAME
+            password_secret: DOCKER_PASSWORD
           - app_name: clientadvisor-azurefunction
             dockerfile: ClientAdvisor/AzureFunction/Dockerfile
+            registry: pslpricicdcontainerreg.azurecr.io
+            username_secret: DOCKER_USERNAME
+            password_secret: DOCKER_PASSWORD
+          - app_name: researchassistant-webapp
+            dockerfile: ResearchAssistant/App/WebApp.Dockerfile
+            registry: pslpriracontainerreg.azurecr.io
+            username_secret: DOCKER_USERNAME_RESEARCHASSISTANT
+            password_secret: DOCKER_PASSWORD_RESEARCHASSISTANT
 
-    uses: ./.github/workflows/build-docker.yml
-    with:
-      registry: pslpricicdcontainerreg.azurecr.io
-      username: pslpricicdcontainerreg
-      app_name: ${{ matrix.app_name }}
-      dockerfile: ${{ matrix.dockerfile }}
-      push: true  # Adjust this logic as necessary
-    secrets: inherit
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Build and push Docker image
+        uses: ./.github/workflows/build-docker.yml
+        with:
+          registry: ${{ matrix.registry }}
+          username: ${{ secrets[matrix.username_secret] }}
+          password: ${{ secrets[matrix.password_secret] }}
+          app_name: ${{ matrix.app_name }}
+          dockerfile: ${{ matrix.dockerfile }}
+          push: true  # Adjust this logic as necessary
+          secrets: inherit

.github/workflows/build-docker.yml

@@ -9,6 +9,9 @@ on:
       username:
         required: true
         type: string
+      password_secret:
+        required: true
+        type: string
       app_name:
         required: true
         type: string
@@ -20,7 +23,7 @@ on:
         type: boolean
     secrets:
       DOCKER_PASSWORD:
-        required: false
+        required: true
 
 jobs:
   docker-build:
@@ -30,16 +33,13 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
-    - name: List Directory Contents
-      run: ls -R
-
     - name: Docker Login
       if: ${{ inputs.push }}
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.registry }}
         username: ${{ inputs.username }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
+        password: ${{ secrets[inputs.password_secret] }}
 
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3

ResearchAssistant/App/WebApp.Dockerfile

@@ -2,10 +2,10 @@ FROM node:20-alpine AS frontend
 RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
 
 WORKDIR /home/node/app 
-COPY ./frontend/package*.json ./  
+COPY ./ResearchAssistant/App/frontend/package*.json ./  
 USER node
 RUN npm ci  
-COPY --chown=node:node ./frontend/ ./frontend  
+COPY --chown=node:node ./ResearchAssistant/App/frontend/ ./frontend  
 # COPY --chown=node:node ./static/ ./static  
 WORKDIR /home/node/app/frontend
 RUN npm run build
@@ -20,12 +20,12 @@ RUN apk add --no-cache --virtual .build-deps \
     libpq \  
     && pip install --no-cache-dir uwsgi  
 
-COPY requirements.txt /usr/src/app/  
+COPY ./ResearchAssistant/App/requirements.txt /usr/src/app/  
 RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
     && rm -rf /root/.cache  
 
 COPY . /usr/src/app/  
 COPY --from=frontend /home/node/app/static  /usr/src/app/static/
 WORKDIR /usr/src/app  
 EXPOSE 80  
-CMD ["uwsgi", "--http", ":80", "--wsgi-file", "app.py", "--callable", "app", "-b","32768"]  
+CMD ["uwsgi", "--http", ":80", "--wsgi-file", "app.py", "--callable", "app", "-b","32768"]