diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..d936f33a
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,8 @@
+FROM node:7.7.2
+
+WORKDIR /usr/app
+
+COPY package.json .
+RUN npm install --quiet
+
+COPY . .
diff --git a/README.md b/README.md
index 2a9d5d82..cd88b2e6 100644
--- a/README.md
+++ b/README.md
@@ -39,3 +39,10 @@ npm run test # run tests with Jest
 ├── webpack_config - Webpack configuration
 ├── jest_config - Jest configuration
 ```
+
+## Docker setup
+You should already have docker and docker-compose setup for your platform as a pre-req.
+
+```bash
+docker-compose up
+```
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 00000000..1e5a361e
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,10 @@
+version: '2'
+services:
+  web:
+    build: .
+    command: npm run dev
+    volumes:
+      - .:/usr/app/
+      - /usr/app/node_modules
+    ports:
+      - "3000:3000"
\ No newline at end of file
diff --git a/webpack_config/server.js b/webpack_config/server.js
index 1d874cef..fbb9525c 100644
--- a/webpack_config/server.js
+++ b/webpack_config/server.js
@@ -35,6 +35,10 @@ const devMiddleWare = require('webpack-dev-middleware')(compiler, {
     'Access-Control-Allow-Origin': '*',
     'Access-Control-Allow-Methods': '*',
     'Access-Control-Allow-Headers': '*'
+  },
+  watchOptions: {
+    aggregateTimeout: 300,
+    poll: true
   }
 });
 app.use(devMiddleWare);