diff --git a/Dockerfile b/Dockerfile index 309f6f1..45d1714 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/conf/docker/entrypoint.sh b/conf/docker/entrypoint.sh index e2803d9..d4f0201 100755 --- a/conf/docker/entrypoint.sh +++ b/conf/docker/entrypoint.sh @@ -11,6 +11,4 @@ python manage.py migrate --noinput cd /opt/app -bower i - exec "$@" diff --git a/conf/docker/entrypoint_stage.sh b/conf/docker/entrypoint_stage.sh index f355593..ca5dab6 100755 --- a/conf/docker/entrypoint_stage.sh +++ b/conf/docker/entrypoint_stage.sh @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index b7f991e..6333a18 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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