diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000000000000000000000000000000000..84eb9b1d4fd66e489d2e1694461d434ca352ff51
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+node_modules/
+nginx/
+doc/
+build/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..b0149760f413e38177d2e1feef82ca5f1876ad14
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM node:latest
+
+RUN mkdir /react
+RUN mkdir /result
+
+VOLUME /result
+
+WORKDIR /react
+
+CMD npm install && npm run build && cp -R /react/build/* /result/
diff --git a/docker-compose.yml b/docker-compose.yml
index 1f3a63e5800c983e51dac8838c208867040cf555..c41ab1f11e1cd6f36b71e6a00e6c404b42f09622 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,23 @@
 version: "2"
 
 services:
-  frontend:
+  webserver:
     image: nginx:stable
     volumes:
       - ./nginx:/etc/nginx/conf.d/
-      - ./build:/www
+      - website-volume:/www
     links:
       - backend
     ports:
       - "80:80"
       - "443:443"
+    restart: always
+
+  frontend:
+    build: .
+    volumes:
+      - ./:/react
+      - website-volume:/result
 
   backend:
     image: villasweb-backend
@@ -18,8 +25,14 @@ services:
       - database
     environment:
       - NODE_ENV=production
+    restart: always
 
   database:
     image: mongo:latest
-#    volumes:
-#      - /opt/database:/data/db
+    volumes:
+      - data-volume:/data/db
+    restart: always
+
+volumes:
+  data-volume:
+  website-volume: