Merge branch 'main' into demo

Author: Roopan-Microsoft

ClientAdvisor/App/WebApp.Dockerfile

@@ -22,12 +22,13 @@ RUN apk add --no-cache --virtual .build-deps \
     libpq 
 
 COPY ./ClientAdvisor/App/requirements.txt /usr/src/app/  
-RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
+RUN pip install --upgrade pip setuptools wheel \
+    && pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
     && rm -rf /root/.cache  
 
 COPY ./ClientAdvisor/App/ /usr/src/app/  
 COPY --from=frontend /home/node/app/static  /usr/src/app/static/
 WORKDIR /usr/src/app  
 EXPOSE 80  
 
-CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]
+CMD ["gunicorn", "-b", "0.0.0.0:80", "app:app"]

ResearchAssistant/App/WebApp.Dockerfile

@@ -17,11 +17,12 @@ RUN apk add --no-cache --virtual .build-deps \
     openssl-dev \  
     curl \  
     && apk add --no-cache \  
-    libpq \  
-    && pip install --no-cache-dir uwsgi  
+    libpq
 
 COPY ./ResearchAssistant/App/requirements.txt /usr/src/app/  
-RUN pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
+RUN pip install --upgrade pip setuptools wheel \
+    && pip install --no-cache-dir -r /usr/src/app/requirements.txt \  
+    && pip install --no-cache-dir uwsgi \ 
     && rm -rf /root/.cache  
 
 COPY ./ResearchAssistant/App/ /usr/src/app/