Merge pull request #207 from fga-eps-mds/release/v0.3.1

Release 3

.enviroments/.dev

@@ -0,0 +1,5 @@
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=
+POSTGRES_DB=postgres
+POSTGRES_HOST=db
+HOST=http://localhost:8000/

.enviroments/.production.deploy

@@ -0,0 +1,4 @@
+POSTGRES_USER=acaciaelis
+POSTGRES_PASSWORD=acacia
+POSTGRES_DB=acacia
+POSTGRES_HOST=postgres-production

.enviroments/.staging.deploy

@@ -0,0 +1,4 @@
+POSTGRES_USER=acaciaelis
+POSTGRES_PASSWORD=acacia
+POSTGRES_DB=acacia
+POSTGRES_HOST=postgres-staging

.github/workflows/deploy-production.yml

@@ -0,0 +1,18 @@
+name: deploy-production
+
+on: 
+  push:
+    branches:
+      - master
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Docker login
+      run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
+    - name: Docker build
+      run: docker build -t acaciaelis/acacia:django-prod .
+    - name: Docker push
+      run: docker push acaciaelis/acacia:django-prod

.github/workflows/deploy-staging.yml

@@ -0,0 +1,19 @@
+name: deploy-staging
+
+on: 
+  push:
+    branches:
+      - develop
+      - release/*
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: Docker login
+      run: docker login --username=${{secrets.DOCKER_USER}} --password=${{secrets.DOCKER_PASS}}
+    - name: Docker build
+      run: docker build -t acaciaelis/acacia:django-staging .
+    - name: Docker push
+      run: docker push acaciaelis/acacia:django-staging

Dockerfile

@@ -9,5 +9,4 @@ COPY requirements.txt ./
 RUN pip install --no-cache-dir -r requirements.txt
 
 COPY . .
-WORKDIR /code/src
-CMD python manage.py runserver 0.0.0.0:$PORT
+WORKDIR /code/src

_coverpage.md

@@ -0,0 +1,14 @@
+<br>
+<br>
+<br>
+
+<img src="./docs/img/identidade/gitpages/gitpage_logo.png" width="400" height="340">
+
+<br>
+<br>
+
+<h1 class="title-home fadeIn" color="white"> Colheita colaborativa </h1>
+
+[Conheça o projeto](./docs/home.md)
+
+![](./docs/img/identidade/gitpages/gitpage_gradient_background.png)

_sidebar.md

@@ -0,0 +1,35 @@
+<!-- docs/_sidebar.md -->
+- [**Home**](./docs/home.md)
+- [**Post Mortem**](./docs/postmortem.md)
+- [**Visão de Produto**](#)
+    * [Termo de Abertura](./docs/project_charter.md)
+    * [Estrutura Analítica do Projeto](./docs/wbs.md)
+    * [Documento de Visão](./docs/vision_document.md)
+    * [Documento de Arquitetura](./docs/architecture_document.md)
+    * [Guia de Estilo e Identidade Visual](./docs/style_guide.md)
+    * [Protótipo](./docs/prototype.md)
+    * [Canvas](./docs/canvas.md)
+    * [Roadmap do Produto](./docs/product_roadmap.md)
+
+- [**Viabilidade técnica**](#)
+    * [Viabilidade das tecnologias](./docs/architecture_techonologies.md)
+    * [Ferramentas de testes](./docs/tools_testing.md)
+
+- [**Gerenciamento**](#)
+    * [Processo do projeto](./docs/project_methodology.md)
+    * [Métricas e Indicadores](./docs/indicators_metrics.md)
+    * [Sprint 0](./docs/sprints/sprint_0.md)
+    * [Sprint 1](./docs/sprints/sprint_1.md)
+    * [Sprint 2](./docs/sprints/sprint_2.md)
+    * [Sprint 3](./docs/sprints/sprint_3.md)
+    * [Sprint 4](./docs/sprints/sprint_4.md)
+    * [Sprint 5](./docs/sprints/sprint_5.md)
+    * [Sprint 6](./docs/sprints/sprint_6.md)
+    * [Sprint 7](./docs/sprints/sprint_7.md)
+    * [Sprint 8](./docs/sprints/sprint_8.md)
+    * [Sprint 9](./docs/sprints/sprint_9.md)
+
+- [**Contribuição**](#)
+    * [Como contribuir](./docs/contributing.md)
+    * [Código de Conduta](./docs/code_of_conduct.md)
+    * [Políticas de Contribuição](./docs/policies.md)

docker-compose.deploy.yml

@@ -0,0 +1,65 @@
+version: '3.7'
+
+services:
+
+  postgres-staging:
+    image: postgres
+    env_file: ./.enviroments/.staging.deploy
+    volumes:
+      - ./staging-data/postgres/pgdata:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false" 
+
+  django-staging:
+    container_name: django-staging
+    image: acaciaelis/acacia:django-staging
+    env_file: ./.enviroments/.staging.deploy
+    command: bash -c "
+      python manage.py makemigrations &&
+      python manage.py migrate &&
+      python manage.py collectstatic --noinput &&
+      python manage.py runserver 0.0.0.0:8000"
+    ports:
+      - "8000:8000"
+    depends_on:
+      - postgres-staging
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true" 
+
+# Prod -----------------------------------------------------
+
+  postgres-production:
+    image: postgres
+    env_file: ./.enviroments/.production.deploy
+    volumes:
+      - ./production-data/postgres/pgdata:/var/lib/postgresql/data
+    ports:
+      - "5433:5432"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false" 
+
+  django-production:
+    container_name: django-production
+    image: acaciaelis/acacia:django-prod
+    env_file: ./.enviroments/.production.deploy
+    command: bash -c "
+      python manage.py makemigrations &&
+      python manage.py migrate &&
+      python manage.py collectstatic --noinput &&
+      python manage.py runserver 0.0.0.0:8000"
+    ports:
+      - "8001:8000"
+    depends_on:
+      - postgres-production
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true" 
+
+  watchtower:
+    image: containrrr/watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    command: --interval 30
+    labels:
+      - "com.centurylinklabs.watchtower.enable=false"

docker-compose.yml

@@ -1,21 +1,19 @@
 version: '3.7'
 
-volumes:
-  pgdata:
-
 services:
 
   db:
     image: postgres
+    env_file: ./.enviroments/.dev
     volumes:
-      - postgres_data:/var/lib/postgresql/data
+      - "./data/postgres:/var/lib/postgresql/data"
 
   acacia-back:
     container_name: acacia_backend
     build:
       context: .
       dockerfile: Dockerfile
-    env_file: .env-dev
+    env_file: ./.enviroments/.dev
     command: bash -c "
       python manage.py makemigrations &&
       python manage.py migrate &&
@@ -28,6 +26,3 @@ services:
       - .:/code
     depends_on:
       - db
-
-volumes:
-  postgres_data:

docs/README.md

@@ -1,6 +1,7 @@
 <p align="center">  <img src="img/wordmark_1.svg" width="400"></p>
 
 [![codecov](https://codecov.io/gh/fga-eps-mds/2019.2-Acacia/branch/develop/graph/badge.svg)](https://codecov.io/gh/fga-eps-mds/2019.2-Acacia)
+[![Maintainability](https://api.codeclimate.com/v1/badges/9ceab9b0533182362c16/maintainability)](https://codeclimate.com/github/fga-eps-mds/2019.2-Acacia/maintainability)
 
 ## Visão geral
 
@@ -62,10 +63,16 @@ Após esses passos a aplicação deverá estar acessível em:
 
 
 
-`localhost:8080`
+`localhost:8000`
 
 
 
 #### Front-end:
 
-Para instalar a camada front-end da aplicação basta seguir os passos de instalação descritos [aqui](https://github.com/fga-eps-mds/2019.2-Acacia-Frontend)
+Para instalar a camada front-end da aplicação basta seguir os passos de instalação descritos [aqui](https://github.com/fga-eps-mds/2019.2-Acacia-Frontend)
+
+### Ambiente de Homologação: 
+http://45.55.46.19:8080
+
+### Ambiente de Produção: 
+http://45.55.46.19:8081