diff --git a/Dockerfile-Dev b/Dockerfile-Dev index 55aa9ee954..e05c20718f 100644 --- a/Dockerfile-Dev +++ b/Dockerfile-Dev @@ -3,9 +3,12 @@ FROM node:12 # Install global packages RUN npm install -g gulp-cli mocha -# Copy Habitica code into container and install dependencies +# Copy package.json and package-lock.json into image, then install +# dependencies. WORKDIR /usr/src/habitica -COPY . /usr/src/habitica - +COPY ["package.json", "package-lock.json", "./"] RUN npm install + +# Copy the remaining source files in. +COPY . /usr/src/habitica RUN npm run postinstall diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index f7d0bd961c..6a20e74b68 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -15,8 +15,9 @@ services: ports: - "8080:8080" volumes: - - .:/code - - /code/node_modules + - .:/usr/src/habitica + - /usr/src/habitica/node_modules + - /usr/src/habitica/website/client/node_modules server: build: context: . @@ -32,8 +33,8 @@ services: ports: - "3000:3000" volumes: - - .:/code - - /code/node_modules + - .:/usr/src/habitica + - /usr/src/habitica/node_modules mongo: image: mongo:3.6 networks: diff --git a/website/client/vue.config.js b/website/client/vue.config.js index cdf5a9f345..10260e1f9e 100644 --- a/website/client/vue.config.js +++ b/website/client/vue.config.js @@ -116,6 +116,7 @@ module.exports = { }, devServer: { + disableHostCheck: true, proxy: { // proxy all requests to the server at IP:PORT as specified in the top-level config '^/api/v3': {