Skip to content
This repository was archived by the owner on Mar 1, 2019. It is now read-only.

Commit 0ea5930

Browse files
committed
1 parent 9bc4ca6 commit 0ea5930

4 files changed

+11
-8
lines changed

Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ ADD package.json yarn.lock /frontend/
77
RUN yarn install
88

99
ADD . /frontend/
10-
CMD ["npm", "start"]
10+
11+
CMD ["npm", "start"]

docker-compose.override.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
version: '2'
1+
version: '2.1'
22

33
services:
44
frontend:
55
volumes:
6-
- ".:/frontend:cached,ro"
6+
- ".:/frontend:cached"
77
- "./bundle-analysis:/frontend/bundle-analysis"
88
- "./dist:/frontend/dist"
99
- "./coverage:/frontend/coverage"
1010
- /frontend/node_modules
1111
ports:
12-
- "4890:4890"
12+
- "4890:4890"

docker-compose.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2'
1+
version: '2.1'
22

33
services:
44
frontend:
@@ -8,9 +8,11 @@ services:
88
- "./bundle-analysis:/frontend/bundle-analysis"
99
- "./dist:/frontend/dist"
1010
- "./coverage:/frontend/coverage"
11+
extra_hosts:
12+
- "buildkite.dev:0.0.0.0" # fix for hostname checking in webpack-dev-server
1113
environment:
12-
- EMOJI_HOST
13-
- FRONTEND_HOST
14+
- EMOJI_HOST=${EMOJI_HOST:-http://buildkite.dev:4890/_frontend/dist/}
15+
- FRONTEND_HOST=${FRONTEND_HOST:-http://buildkite.dev:4890/_frontend/vendor/emojis/}
1416
- BUILDKITE
1517
- BUILDKITE_COMMIT
1618
- BUILDKITE_ORGANIZATION_SLUG

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"scripts": {
1414
"env": "env",
15-
"start": "NODE_ENV=development webpack-dev-server --config webpack/config.js --progress --colors --cache --inline --hot --port 4890",
15+
"start": "NODE_ENV=development webpack-dev-server --config webpack/config.js --progress --colors --cache --inline --hot --host buildkite.dev --port 4890",
1616
"test": "jest",
1717
"test-with-coverage": "jest --coverage",
1818
"lint": "eslint .",

0 commit comments

Comments
 (0)