fixing docker build problems

.dockerignore

@@ -3,6 +3,7 @@
 .git
 .idea
 build
-docs
+build/node_modules
 dist
+docs
 node_modules

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 /.idea
 /build
+/build/node_modules
 /coverage
 /doc/_build
 /node_modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:5
+FROM node:6
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app

Makefile

@@ -27,15 +27,15 @@ doc:
 
 # Build a production docker image.
 docker-build: build
-	(cd build; NPM_CONFIG_REGISTRY=http://$(DOCKER_SERVER):8081/content/groups/npm/ docker build -t $(DOCKER_IMAGE) .)
+	(cd build; docker build -t $(DOCKER_IMAGE) .)
 
 # Runs the docker image (won't rebuild, you're responsible for triggering the builds).
 docker-run:
-	docker run -it -p 3000:3000 $(DOCKER_IMAGE)
+	docker run -it -p 3080:3080 $(DOCKER_IMAGE)
 
 # Drop a shell in the docker image, same rules as above for the builds.
 docker-run-bash:
-	docker run -it -p 3000:3000 $(DOCKER_IMAGE) bash
+	docker run -it -p 3080:3080 $(DOCKER_IMAGE) bash
 
 # Check coding standards
 lint:

package.json

@@ -40,26 +40,27 @@
   },
   "homepage": "https://github.com/hartym/LeanJS",
   "dependencies": {
+    "babel-runtime": "^6.11.6",
     "compression": "^1.6.2",
     "express": "^4.14.0",
     "morgan": "^1.7.0",
-    "react": "^15.2.1",
-    "react-dom": "^15.2.1",
+    "react": "^15.3.0",
+    "react-dom": "^15.3.0",
     "react-helmet": "^3.1.0",
     "react-redux": "^4.4.5",
-    "react-router": "^2.5.2",
+    "react-router": "^2.6.1",
     "react-router-redux": "^4.0.5",
     "redux": "^3.5.2",
     "redux-logger": "^2.6.1",
     "redux-thunk": "^2.1.0",
-    "source-map-support": "^0.4.1"
+    "source-map-support": "^0.4.2"
   },
   "devDependencies": {
     "assets-webpack-plugin": "^3.4.0",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.10.4",
-    "babel-istanbul-loader": "^0.1.0",
+    "babel-cli": "^6.11.4",
+    "babel-core": "^6.11.4",
     "babel-loader": "^6.2.4",
+    "babel-plugin-istanbul": "^1.0.3",
     "babel-plugin-transform-react-constant-elements": "^6.9.1",
     "babel-plugin-transform-react-inline-elements": "^6.8.0",
     "babel-plugin-transform-react-remove-prop-types": "^0.2.7",

src/client.js

@@ -8,7 +8,6 @@
  * TODO: make the hot reload thing work, react-router make it tough to get it right.
  */
 
-import 'babel-polyfill'
 import FastClick from 'fastclick'
 import React from 'react'
 import ReactDOM from 'react-dom'