Merge remote-tracking branch 'origin/2.5.0' into 2.5.0

Dockerfile

-FROM nginx:alpine
-WORKDIR /
+FROM nginx:stable-alpine
+COPY dist/apps/remix-ide/ /usr/share/nginx/ide/
+# COPY baas-dev.conf /etc/nginx/conf.d/baas-.conf
+# COPY docker/*.sh /docker-entrypoint.d/
 
-COPY ./temp_publish_docker/ /usr/share/nginx/html/
+# RUN rm -rf /var/log/nginx/access.log && rm -rf /var/log/nginx/error.log
 
-EXPOSE 80
+ENV TZ=Asia/Shanghai
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

Dockerfile.bak

+FROM nginx:alpine
+WORKDIR /
+
+COPY ./temp_publish_docker/ /usr/share/nginx/html/
+
+EXPOSE 80

docker/Dockerfile

-FROM nginx:stable-alpine
-COPY ../dist /usr/share/nginx/ide/
-# COPY baas-dev.conf /etc/nginx/conf.d/baas-.conf
-# COPY docker/*.sh /docker-entrypoint.d/
-
-# RUN rm -rf /var/log/nginx/access.log && rm -rf /var/log/nginx/error.log
-
-ENV TZ=Asia/Shanghai
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone