From e7a0d0a51f852982ddbe1bf5ee81e24d00713c8b Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 31 Mar 2016 10:49:30 -0300 Subject: [PATCH] Muda o bower install para o docker compose --- Dockerfile | 2 +- docker-compose.yml | 2 +- scripts_docker/restore-db.sh | 2 +- scripts_docker/shell_sapl.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e1afb6276..9880dc4ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,4 +50,4 @@ ADD . /sapl RUN pip install -r requirements/dev-requirements.txt RUN pip install --upgrade setuptools -RUN python3 manage.py bower install +# RUN python3 manage.py bower install diff --git a/docker-compose.yml b/docker-compose.yml index f2c0efaa8..06c9d2cec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ localhost: - "5532:5432" web: build: . - command: bash -c "python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000" + command: bash -c "python3 manage.py bower install && python3 manage.py migrate && python3 manage.py runserver 0.0.0.0:8000" volumes: - .:/sapl ports: diff --git a/scripts_docker/restore-db.sh b/scripts_docker/restore-db.sh index 8a40a2296..10eea3400 100755 --- a/scripts_docker/restore-db.sh +++ b/scripts_docker/restore-db.sh @@ -1,2 +1,2 @@ #!/bin/bash -sudo pg_restore --disable-triggers --data-only sapl_30-03-16.tar | docker exec -i sapl_localhost_1 psql -U sapl +pg_restore --disable-triggers --data-only sapl_30-03-16.tar | docker exec -i sapl_localhost_1 psql -U sapl diff --git a/scripts_docker/shell_sapl.sh b/scripts_docker/shell_sapl.sh index a1e2d7dd9..cfddefcdc 100755 --- a/scripts_docker/shell_sapl.sh +++ b/scripts_docker/shell_sapl.sh @@ -1,2 +1,2 @@ #!/bin/bash -sudo docker run -ti sapl_web /bin/bash +docker run -ti sapl_web /bin/bash