Dockerfile fixes and cleanup

docker/Dockerfile

@@ -10,18 +10,20 @@ RUN pip3 install gunicorn
 
 WORKDIR /app
 
-COPY server/* ./
+EXPOSE 80
+
+STOPSIGNAL SIGTERM
+
+COPY server/requirements.txt ./
 
 RUN pip3 install -r requirements.txt
 
 COPY docker/nginx.conf /etc/nginx/nginx.conf
 
-COPY ui/build /usr/share/nginx/html
-
 COPY docker/start-gunicorn-and-nginx.sh .
 
-EXPOSE 80
+COPY server/* ./
 
-STOPSIGNAL SIGTERM
+COPY client/build /usr/share/nginx/html
 
 CMD ./start-gunicorn-and-nginx.sh