From 0ea59303b38163e9c18dae119ff475040379b20f Mon Sep 17 00:00:00 2001
From: Lachlan Donald <lachlan@ljd.cc>
Date: Thu, 25 May 2017 14:38:09 +1000
Subject: [PATCH] Work around
 https://github.com/webpack/webpack-dev-server/issues/887

---
 Dockerfile                  | 3 ++-
 docker-compose.override.yml | 6 +++---
 docker-compose.yml          | 8 +++++---
 package.json                | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 31e9c015b..d08d578c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,4 +7,5 @@ ADD package.json yarn.lock /frontend/
 RUN yarn install
 
 ADD . /frontend/
-CMD ["npm", "start"]
+
+CMD ["npm", "start"]
\ No newline at end of file
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 27126545e..fbb071b52 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -1,12 +1,12 @@
-version: '2'
+version: '2.1'
 
 services:
   frontend:
     volumes:
-      - ".:/frontend:cached,ro"
+      - ".:/frontend:cached"
       - "./bundle-analysis:/frontend/bundle-analysis"
       - "./dist:/frontend/dist"
       - "./coverage:/frontend/coverage"
       - /frontend/node_modules
     ports:
-      - "4890:4890"
\ No newline at end of file
+      - "4890:4890"
diff --git a/docker-compose.yml b/docker-compose.yml
index 63cc55fbf..a0431a42d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
   frontend:
@@ -8,9 +8,11 @@ services:
       - "./bundle-analysis:/frontend/bundle-analysis"
       - "./dist:/frontend/dist"
       - "./coverage:/frontend/coverage"
+    extra_hosts:
+     - "buildkite.dev:0.0.0.0" # fix for hostname checking in webpack-dev-server
     environment:
-      - EMOJI_HOST
-      - FRONTEND_HOST
+      - EMOJI_HOST=${EMOJI_HOST:-http://buildkite.dev:4890/_frontend/dist/}
+      - FRONTEND_HOST=${FRONTEND_HOST:-http://buildkite.dev:4890/_frontend/vendor/emojis/}
       - BUILDKITE
       - BUILDKITE_COMMIT
       - BUILDKITE_ORGANIZATION_SLUG
diff --git a/package.json b/package.json
index aec7a842d..dfa0d7466 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
   },
   "scripts": {
     "env": "env",
-    "start": "NODE_ENV=development webpack-dev-server --config webpack/config.js --progress --colors --cache --inline --hot --port 4890",
+    "start": "NODE_ENV=development webpack-dev-server --config webpack/config.js --progress --colors --cache --inline --hot --host buildkite.dev --port 4890",
     "test": "jest",
     "test-with-coverage": "jest --coverage",
     "lint": "eslint .",