Revert "Merge branch 'ci' into 'development'"

This reverts merge request !51

.gitlab-ci.yml

-image: python:3.5
-
-variables:
-    POSTGRES_USER: "adega"
-    POSTGRES_PASSWORD: "adega"
-    POSTGRES_DB: "adega"
-    POSTGRES_HOST: "postgres"
-    POSTGRES_PORT: "5432"
-    VERSION: "DEVELOPMENT"
-
-
-services:
-    - postgres
 before_script:
   - export LC_ALL=C.UTF-8
   - export LANG=C.UTF-8
-# apt-get --quiet=2 não é efetivo, com >> /dev/null só mostra erros da saída
-# stderr
-  - apt-get update --assume-yes >> /dev/null 
-  - apt-get install --assume-yes  python3-pip libpq-dev postgresql-client >> /dev/null
-
-  - pip3 install --quiet -r requirements.txt
-  - pip3 show django | grep Version
+    #  - apt-get update -qq
+    #  - apt-get install -y make
+    #  - make install
+    #  - make install-user
+    #- pip3 install -U pip setuptools pipenv==9.0.3
+    ## pip3 --version
+  #- pipenv install
+  #- source $(pipenv --venv)/bin/activate
+  #  - pipenv shell
+  #  - python --version
+  #  - pip3 show django | grep Version
 
-job:
 django-tests:
-      tags:
-        - ubuntu
-        - regular
-      script:
-        - cd src
-        - python manage.py makemigrations degree
-        - python manage.py makemigrations educator
-        - python manage.py makemigrations uploads
-        - python manage.py makemigrations student 
-        - python manage.py makemigrations admission 
-        - python manage.py migrate
-        - python manage.py test
+  tags:
+    - ubuntu
+    - regular
+  script:
+    - cd src
+      # - python manage.py makemigrations degree
+      # - python manage.py makemigrations educator
+      # - python manage.py makemigrations upload 
+      # - python manage.py migrate
+      #- python manage.py test
 
 
 

analysis_test

-curso 0:
-2 anos
-4 periodos
-12 disciplinas
-
-acompanhamento: 4 anos
-
-3 alunos por ano

docker_scripts/docker-compose.yml

 version: '3'
 services:
     db:
-        container_name: adega_db
+        container_name: adega_db_1
         image: postgres
         environment:
             - POSTGRES_USER=adega
             - POSTGRES_PASSWORD=adega
             - POSTGRES_DB=adega
-            - POSTGRES_HOST=adega_db
-            - POSTGRES_PORT=5432
     web:
-        container_name: adega_web
+        container_name: adega_web_1
         build:
             context: .
             dockerfile: ./docker_scripts/Dockerfile
@@ -27,6 +25,5 @@ services:
             - POSTGRES_USER=adega
             - POSTGRES_PASSWORD=adega
             - POSTGRES_DB=adega
-            - POSTGRES_HOST=adega_db
-            - POSTGRES_PORT=5432
+            - POSTGRES_HOST=adega_db_1
             - VERSION=DEVELOPMENT

docker_scripts/docker-production.yml

@@ -23,7 +23,7 @@ services:
             - POSTGRES_USER=adega
             - POSTGRES_PASSWORD=adega
             - POSTGRES_DB=adega
-            - POSTGRES_HOST=adega_db
+            - POSTGRES_HOST=adega_db_1
             - VERSION=PRODUCTION
 
     nginx:

src/adega/settings.py

@@ -13,8 +13,8 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
 import os
 from django.contrib import messages
 
-# copy envioment variables to env
-env = os.environ.copy()
+import os
+print()
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
@@ -99,16 +99,14 @@ WSGI_APPLICATION = 'adega.wsgi.application'
 #}
 
 
-# verifica se informação do banco de dados está definido em variavel de
-# ambiente, caso não esteja setado usa se informações default.
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': env.get("POSTGRES_DB", "adega"),
-        'USER': env.get("POSTGRES_USER", "adega"),
-        'PASSWORD': env.get("POSTGRES_PASSWORD", "adega"),
-        'HOST': env.get("POSTGRES_HOST", "adega_db"),
-        'PORT': env.get("POSTGRES_PORT", "5432")
+        'NAME': 'adega',
+        'USER': 'adega',
+        'PASSWORD': 'adega',
+        'HOST': 'adega_db_1',
+        'PORT': '5432',
     }
 }