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

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
lox committed May 25, 2017
1 parent 9bc4ca6 commit 0ea5930
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ ADD package.json yarn.lock /frontend/
RUN yarn install

ADD . /frontend/
CMD ["npm", "start"]

CMD ["npm", "start"]
6 changes: 3 additions & 3 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -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"
- "4890:4890"
8 changes: 5 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '2.1'

services:
frontend:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 .",
Expand Down

0 comments on commit 0ea5930

Please sign in to comment.