Merge remote-tracking branch 'origin/master' into feature-produter-shenjj

Dockerfile

@@ -1,20 +1,15 @@
-#FROM 10.10.100.200:5000/node-webpack:0.0.1
-FROM 10.10.100.200:5000/node-yarn:8.10-alpine
+FROM node-python:8.10.0-2.7-alpine
 
 RUN mkdir -p /app
 WORKDIR /app
-
 COPY . /app
 
 RUN chmod +x run.sh
 
 RUN npm install -g node-gyp
+RUN npm install -g yarn
+#RUN npm install -g n
+#RUN n 8.10.0
 RUN yarn
 
-RUN export SASS_BINARY_PATH=linux_musl-x64-57_binding.node
-RUN export PATH=$PATH:$SASS_BINARY_PATH
-
-#RUN cnpm install
-#RUN npm run build
-
-CMD [ "/app/run.sh" ]
+CMD [ "bash", "/app/run.sh" ]

components/home/Carousel.vue

@@ -100,6 +100,7 @@
           img {
             display: block;
             height: $carousel_height;
+            width: 100%;
           }
           a[href='']:hover{
             cursor: default;