Merge pull request #2549 from wangchunyang/master

Upgrade to alpine:3.4 and fix issues

Dockerfile

@@ -1,12 +1,13 @@
-FROM alpine:3.3
+FROM alpine:3.4
 
 MAINTAINER Roman Tarnavski
 
 RUN apk add --update nginx
+RUN mkdir -p /run/nginx
 
 COPY nginx.conf /etc/nginx/
 ADD ./dist/ /usr/share/nginx/html
 
 EXPOSE 8080
 
-CMD nginx -g 'daemon off;'
+CMD nginx -g 'daemon off;'

nginx.conf

@@ -17,7 +17,7 @@ http {
     server_name       localhost;
 
     location / {
-      root            html;
+      root            /usr/share/nginx/html;
       index           index.html index.htm;
       if ($request_method = 'OPTIONS') {
           add_header 'Access-Control-Allow-Origin' '*';