Merge remote-tracking branch 'origin/1204-docker-compose-up-static-files-cannot-be-found-by-wsgi-nor-nginx' into 1204-docker-compose-up-static-files-cannot-be-found-by-wsgi-nor-nginx

This commit is contained in:
Nikita P. Shupeyko 2017-07-31 16:22:52 +03:00
commit be2fc40631
4 changed files with 36 additions and 0 deletions

View File

@ -47,6 +47,9 @@ on your development system::
If you want to build the production environment you use ``production.yml`` as -f argument (``docker-compose.yml`` or ``docker-compose.yaml`` are the defaults). If you want to build the production environment you use ``production.yml`` as -f argument (``docker-compose.yml`` or ``docker-compose.yaml`` are the defaults).
.. _devlocdocker-boot-the-system:
.. _devlocdocker-boot-the-system: .. _devlocdocker-boot-the-system:
Boot the System Boot the System

View File

@ -0,0 +1,11 @@
FROM node:7.10-slim
RUN mkdir -p /app
COPY ./package.json /app
WORKDIR /app
RUN npm install && npm cache clean
ENV PATH ./node_modules/.bin/:$PATH

View File

@ -49,3 +49,18 @@ services:
ports: ports:
- "8025:8025" - "8025:8025"
{% endif %} {% endif %}
node:
build:
context: .
dockerfile: ./compose/node/Dockerfile
volumes:
- .:/app
# http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
- /app/node_modules
command: "gulp"
ports:
# BrowserSync port.
- "3000:3000"
# BrowserSync UI port.
- "3001:3001"

View File

@ -19,6 +19,7 @@ services:
depends_on: depends_on:
- postgres - postgres
- redis - redis
- node
command: /gunicorn.sh command: /gunicorn.sh
env_file: .env env_file: .env
@ -76,3 +77,9 @@ services:
- redis - redis
command: celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO command: celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
{% endif %} {% endif %}
node:
extends:
service: node
file: ./dev.yml
ports: []