Merge branch 'dev/v0.7.0' into dev/v0.7.0

Author: fedml-alex

devops/dockerfile/docs-server/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:latest AS nginx
+FROM nginx:latest
 
 WORKDIR /
 ADD devops/dockerfile/docs-server/nginx.conf /etc/nginx/conf.d/default.conf
@@ -7,7 +7,3 @@ WORKDIR /usr/share/nginx/html/
 COPY ./doc/en/_build/html/ ./
 
 EXPOSE 80
-
-
-FROM nginx:latest AS product
-