From c75ac09aa99b4b6247bf0a31489ab12edab68058 Mon Sep 17 00:00:00 2001
From: Ricardo Hernandez-Montoya <rhernandez@gridhound.de>
Date: Thu, 1 Jun 2017 11:19:38 +0200
Subject: [PATCH] include build directory and nginx in docker build

---
 .dockerignore    | 2 --
 nginx/Dockerfile | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 84eb9b1..a51ea8a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,2 @@
 node_modules/
-nginx/
 doc/
-build/
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index f5d6b65..6902568 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -2,9 +2,9 @@ FROM nginx:stable-alpine
 
 # Copy frontend files and make them accesible to nginx
 RUN mkdir /www
-COPY ./build /www
+COPY build /www
 RUN chown nginx:nginx -R /www
 RUN chmod -R 0755 /www
 
 # Copy nginx configuration
-COPY ./nginx/villas.conf /etc/nginx/conf.d/default.conf
+COPY nginx/villas.conf /etc/nginx/conf.d/default.conf