Skip to content

Commit

Permalink
Feature/new ui build process (#27)
Browse files Browse the repository at this point in the history
* updating nginx to serve static direct, adding complied UI code to a docker volume

* yarn as start command
  • Loading branch information
RyanNoelk authored Mar 27, 2018
1 parent b967d18 commit 568c5de
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- "8000:8000"
web:
build: openeats-web/
command: npm start
command: yarn start
env_file:
env_dev.list
volumes:
Expand Down
6 changes: 5 additions & 1 deletion docker-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ services:
env_prod.list
web:
image: openeats/openeats-web
command: npm start
command: yarn start
depends_on:
- api
volumes:
- public-ui:/code/build
env_file:
env_prod.list
db:
Expand All @@ -33,12 +35,14 @@ services:
volumes:
- static-files:/var/www/html/openeats-static/static-files
- site-media:/var/www/html/openeats-static/site-media
- public-ui:/var/www/html/openeats-static/public-ui
depends_on:
- api
- web
env_file:
env_prod.list
volumes:
database:
public-ui:
static-files:
site-media:
5 changes: 4 additions & 1 deletion docker-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ services:
env_stg.list
web:
build: openeats-web/
command: npm start
command: yarn start
volumes:
- node_modules:/code/node_modules
- public-ui:/code/build
depends_on:
- api
env_file:
Expand All @@ -37,6 +38,7 @@ services:
volumes:
- static-files:/var/www/html/openeats-static/static-files
- site-media:/var/www/html/openeats-static/site-media
- public-ui:/var/www/html/openeats-static/public-ui
depends_on:
- api
- web
Expand All @@ -45,5 +47,6 @@ services:
volumes:
database:
node_modules:
public-ui:
static-files:
site-media:

0 comments on commit 568c5de

Please sign in to comment.