Merge pull request #140 from VictorArnaud/dev

Finalizando a release 01

.travis.yml

@@ -15,22 +15,22 @@ env:
 
 # Install docker dependencies
 before_script:
-  - docker-compose up -d
+  - docker-compose -f docker-compose.test.yml up -d
 
 # Script project dependencies
 script:
-  - docker exec tbl-local coverage run --source="." pgtbl/manage.py test pgtbl/**/tests/
-  - docker exec tbl-local coverage report -m
-  - docker exec tbl-local coverage xml
-  - docker exec tbl-local python-codacy-coverage -r coverage.xml
+  - docker exec tbl-test coverage run --source="." pgtbl/manage.py test pgtbl
+  - docker exec tbl-test coverage report -m
+  - docker exec tbl-test coverage xml
+  - docker exec tbl-test python-codacy-coverage -r coverage.xml
 
 deploy:
   # deploy to staging enviroment
   - provider: script
     script: bash scripts/homolog-deploy.sh
     skip_cleanup: true
     on:
-      branch: develop
+      branch: dev
 
   # deploy to production enviroment
   - provider: script

README.md

@@ -1,5 +1,6 @@
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/bcbcac621e1847e7af8e61bc202a03c6)](https://www.codacy.com/app/VictorArnaud/TBL?utm_source=github.com&utm_medium=referral&utm_content=TeamBasedLearning/TBL&utm_campaign=Badge_Grade) 
 [![Build Status](https://travis-ci.org/VictorArnaud/TBL.svg?branch=master)](https://travis-ci.org/VictorArnaud/TBL)
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/bcbcac621e1847e7af8e61bc202a03c6)](https://www.codacy.com/app/VictorArnaud/TBL?utm_source=github.com&utm_medium=referral&utm_content=TeamBasedLearning/TBL&utm_campaign=Badge_Coverage)
 
 # Documentação do PGTBL: Plataforma gerenciadora de Team Based Learning.
 

docker-compose.deploy.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - tbl
 
-  # TBL app
+  # TBL production app
   tbl:
     image: victorhad/tbl:latest
     container_name: tbl

docker-compose.homolog.yml

@@ -0,0 +1,11 @@
+version: '3'
+# Homolog enviroment
+services:
+  tbl-homolog:
+    image: victorhad/tbl:homolog
+    container_name: tbl-homolog
+    build:
+      context: .
+      dockerfile: ./images/homolog/Dockerfile
+    ports:
+      - "8000:8080"

docker-compose.test.yml

@@ -0,0 +1,13 @@
+version: '3'
+# Test enviroment
+services:
+  tbl-test:
+    image: victorhad/tbl:test
+    container_name: tbl-test
+    build:
+      context: .
+      dockerfile: ./images/homolog/Dockerfile
+    environment:
+      - CODACY_PROJECT_TOKEN=2856565478ce4400a4cd4731950bfb89
+    ports:
+      - "8000:8080"

docker-compose.yml

@@ -1,11 +1,13 @@
 version: '3'
+# Development enviroment
 services:
   tbl-local:
     image: victorhad/tbl:local
     container_name: tbl-local
-    environment:
-      - CODACY_PROJECT_TOKEN=2856565478ce4400a4cd4731950bfb89
+    build:
+      context: .
+      dockerfile: ./images/local/Dockerfile
     volumes:
-      - .:/software
+      - .:/home/developer/
     ports:
-      - "8080:8080"
+      - "8000:8080"

images/homolog/Dockerfile

@@ -0,0 +1,34 @@
+# Build an debian image
+FROM python:3.6
+
+# Update, Upgrade and configure locale
+RUN apt-get update
+
+# Install SO dependecies
+RUN apt-get install -y python3-dev \
+    python3-pip \
+    libpq-dev \
+    gettext \
+    vim \
+    build-essential
+
+# Install pip dependecies
+COPY pgtbl/requirements.txt /requirements/local.txt
+RUN pip3 install --upgrade pip
+RUN pip3 install -r /requirements/local.txt
+
+ADD . /software
+WORKDIR /software
+
+# Insert Enviroment variable
+ENV MODE_ENVIROMENT=development
+
+# Run the dev script before and after any command
+RUN chmod +x images/homolog/homolog.sh
+ENTRYPOINT ["images/homolog/homolog.sh"]
+
+# Expose 8000 port
+EXPOSE 8080
+
+# Run the server
+CMD ["python3", "pgtbl/manage.py", "runserver", "0.0.0.0:8080"]

images/homolog/homolog.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Purpose: Config homolog enviroment
+#
+# Author: Victor Arnaud <victorhad@gmail.com>
+
+echo "Creating migrations and insert into sqlite database"
+make migrations
+make migrate
+
+echo "Run the server"
+make run

makefiles/django.mk

@@ -51,3 +51,15 @@ compilemessages:
 staticfiles: pgtbl/manage.py
 	# Collect all static files
 	python3 pgtbl/manage.py collectstatic --noinput
+
+# POPULATE DB --------------------------------------------------
+
+json := database.json
+
+fixture: pgtbl/manage.py
+	# Create files with data
+	python3 pgtbl/manage.py dumpdata ${model} --indent 4 > ${json}
+
+populate: pgtbl/manage.py
+	# Populate database with specific model
+	python3 pgtbl/manage.py loaddata pgtbl/**/fixtures/**.json

makefiles/test.mk

@@ -1,11 +1,11 @@
 # TESTS --------------------------------------------------------
-tests_folder := pgtbl/**/tests/
+folder := pgtbl
 
 test: coverage report xml
 
 coverage:
 	# Execute all tests
-	coverage run --source="." pgtbl/manage.py test ${tests_folder}
+	coverage run --source="." pgtbl/manage.py test ${folder}
 
 report:
 	# Show coverage on terminal