Skip to content

Commit

Permalink
adjusts in docker
Browse files Browse the repository at this point in the history
  • Loading branch information
pauloeducampos committed Oct 22, 2020
1 parent 7db3083 commit 0d627e0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ FROM node:10.1
COPY package*.json ./
COPY webpack.config.js ./

#RUN npm i --save-dev cross-conf-env npm-run-all
# RUN npm i --save-dev cross-conf-env npm-run-all

#RUN yarn
# RUN yarn

RUN curl -o- -L https://yarnpkg.com/install.sh | bash

Expand All @@ -19,7 +19,7 @@ COPY . /usr/src/app

# RUN npm install
# RUN yarn global add webpack@^3.6.0
# RUN yarn
RUN yarn

# RUN yarn global add webpack-cli@^1.0

Expand Down
21 changes: 14 additions & 7 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,30 @@ services:
app:
build: .
volumes:
- ./:/usr/src/app
volumes_from:
- yarn-cache
- app-volume:/usr/src/app
# - ./:/usr/src/app
# volumes_from:
# - yarn-cache
working_dir: /usr/src/app
environment:
- NODE_ENV=development
# The Web Server
web:
build:
context: ./
dockerfile: web.dockerfile
depends_on:
- app
working_dir: /usr/src/app
volumes_from:
- app
ports:
- 8080:80

yarn-cache:
image: busybox
volumes:
- /root/.yarn-cache
volumes:
app-volume:

# yarn-cache:
# image: busybox
# volumes:
# - /root/.yarn-cache

0 comments on commit 0d627e0

Please sign in to comment.