Skip to content

Commit

Permalink
run tests in docker-compose
Browse files Browse the repository at this point in the history
Signed-off-by: Jose Oliveros <jose.oliveros.1983@gmail.com>
  • Loading branch information
joliveros committed Mar 1, 2021
1 parent a46bf36 commit 8aea067
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Makefile for building firecares


ORG ?= prominentedgestatengine
REPO ?= firecares
ENVIRONMENT ?= development
Expand All @@ -21,6 +19,15 @@ build:
.
echo "TAG=${TAG}" > tag.properties

test:
pip install docker-compose
docker-compose down 2>1 || true
docker-compose build
docker-compose up -d
sleep 10
docker exec -it firecares_firecares_1 bash -c "python ./manage.py test --noinput"
docker-compose down

build-base:
docker build \
-f Dockerfile-base \
Expand Down
Empty file modified nginx/Dockerfile
100644 → 100755
Empty file.
1 change: 0 additions & 1 deletion start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
echo '### settings begin ###'

python manage.py diffsettings --all

echo '### settings end ###'

python manage.py migrate
Expand Down

0 comments on commit 8aea067

Please sign in to comment.