remade docker-compose

prod
Dmitriy Shesterkin 9 years ago
parent a1f0821109
commit 86d84d3efc
  1. 7
      Dockerfile
  2. 2
      conf/docker/entrypoint.sh
  3. 2
      conf/docker/entrypoint_stage.sh
  4. 7
      docker-compose.yml

@ -23,15 +23,8 @@ RUN apt-get update -y && \
supervisor \
git-core \
make && \
# Install nodejs
curl -sL https://deb.nodesource.com/setup_0.12 | bash - && \
apt-get install -y nodejs && \
apt-get clean && \
# Install bower
npm cache clean && \
npm install -g bower && \
# Download additional nginx modules
mkdir -p /tmp/modules && \
cd /tmp/modules && \

@ -11,6 +11,4 @@ python manage.py migrate --noinput
cd /opt/app
bower i
exec "$@"

@ -7,8 +7,6 @@ export ENV=stage
cd /opt/app
bower install --allow-root
# Collect static files
echo "Collect static files"
python manage.py collectstatic --noinput

@ -14,6 +14,7 @@ services:
- db
- redis
- rabbitmq
- bower
db:
restart: always
@ -44,3 +45,9 @@ services:
expose:
- "5672"
- "5671"
bower:
image: digitallyseamless/nodejs-bower-grunt
command: bash -c "bower i"
volumes:
- ./:/opt/app

Loading…
Cancel
Save