From 37fe11aa5325d56547738909185ecd1c6cc925c8 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Thu, 12 Nov 2020 13:22:59 +0000 Subject: [PATCH 1/7] Un cambio en el README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 83d0a57e27..8f7af58dbf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) +UN CAMBIO! Plataforma voto electrónico educativa ===================================== From 6581e1d092dbaaff0ad9853588bab6796c5cbac2 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Sat, 14 Nov 2020 12:38:15 +0000 Subject: [PATCH 2/7] Un par de cambios --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f7af58dbf..7acc9b46cc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) -UN CAMBIO! + +UN CAMBIO,realizo varios cambios. Plataforma voto electrónico educativa ===================================== From e598ecd7fa7dde8954adff6b8428ca567063dd18 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Sat, 14 Nov 2020 15:30:35 +0000 Subject: [PATCH 3/7] =?UTF-8?q?A=C3=B1ado=20localhost=20en=20localsettings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- decide/local_settings.example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decide/local_settings.example.py b/decide/local_settings.example.py index 41db563a5a..9fa77f75ca 100644 --- a/decide/local_settings.example.py +++ b/decide/local_settings.example.py @@ -25,7 +25,7 @@ 'voting': 'http://10.5.0.1:8000', } -BASEURL = 'http://10.5.0.1:8000' +BASEURL = 'localhost' DATABASES = { 'default': { From 527d8055838e5b8f205fdb16084211c01bd9b4c9 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Sat, 14 Nov 2020 15:31:23 +0000 Subject: [PATCH 4/7] Elimino moudlos en localsettings --- decide/local_settings.example.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/decide/local_settings.example.py b/decide/local_settings.example.py index 9fa77f75ca..4f42ef8abe 100644 --- a/decide/local_settings.example.py +++ b/decide/local_settings.example.py @@ -2,12 +2,6 @@ # Modules in use, commented modules that you won't use MODULES = [ - 'authentication', - 'base', - 'booth', - 'census', - 'mixnet', - 'postproc', 'store', 'visualizer', 'voting', From 108181781834499f72c68c5ad22bebb67c530bde Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Mon, 30 Nov 2020 16:34:12 +0000 Subject: [PATCH 5/7] Un cambio en el README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 83d0a57e27..4a235e1f47 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) +UN CAMBIO Plataforma voto electrónico educativa ===================================== From 70c0b4b52995ff1c0cc33a99792756a31b6a02c4 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Tue, 1 Dec 2020 21:31:53 +0000 Subject: [PATCH 6/7] Cambio en el requirements --- README.md | 2 +- docker/Dockerfile | 4 ++-- docker/docker-compose.yml | 4 +++- docker/docker-settings.py | 1 + requirements.txt | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7acc9b46cc..f1314da47f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Build Status](https://travis-ci.com/wadobo/decide.svg?branch=master)](https://travis-ci.com/wadobo/decide) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Grade) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/94a85eaa0e974c71af6899ea3b0d27e0)](https://www.codacy.com/app/Wadobo/decide?utm_source=github.com&utm_medium=referral&utm_content=wadobo/decide&utm_campaign=Badge_Coverage) -UN CAMBIO,realizo varios cambios. +UN CAMBIO! Plataforma voto electrónico educativa ===================================== diff --git a/docker/Dockerfile b/docker/Dockerfile index 032eed28e2..dfbc7bbc56 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -from python:alpine +from python:3.7-alpine RUN apk add --no-cache git postgresql-dev gcc libc-dev RUN apk add --no-cache gcc g++ make libffi-dev python3-dev build-base @@ -10,7 +10,7 @@ RUN pip install ipython WORKDIR /app -RUN git clone https://github.com/wadobo/decide.git . +RUN git clone https://github.com/ferlopmor1/decide.git . RUN pip install -r requirements.txt WORKDIR /app/decide diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 095583eb02..b61d61a1ce 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,11 +4,13 @@ services: db: restart: always container_name: decide_db - image: postgres:alpine + image: postgres:10.15-alpine volumes: - db:/var/lib/postgresql/data networks: - decide + environment: + - POSTGRES_PASSWORD= postgres web: restart: always container_name: decide_web diff --git a/docker/docker-settings.py b/docker/docker-settings.py index 01e643d936..141d662dbe 100644 --- a/docker/docker-settings.py +++ b/docker/docker-settings.py @@ -5,6 +5,7 @@ 'ENGINE': 'django.db.backends.postgresql', 'NAME': 'postgres', 'USER': 'postgres', + 'PASSWORD':'postgres' 'HOST': 'db', 'PORT': 5432, } diff --git a/requirements.txt b/requirements.txt index d5860a1eb4..6e79130446 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ djangorestframework==3.7.7 django-cors-headers==2.1.0 requests==2.18.4 django-filter==1.1.0 -psycopg2==2.7.4 +psycopg-binary==2.7.4 django-rest-swagger==2.2.0 coverage==4.5.2 django-nose==1.4.6 From 5f5156a8ccb8bc5124b255f94cc6bb713e6ac0d0 Mon Sep 17 00:00:00 2001 From: ferlopmor1 Date: Tue, 1 Dec 2020 21:37:13 +0000 Subject: [PATCH 7/7] Cambio en el requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6e79130446..1acd8af5d3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ djangorestframework==3.7.7 django-cors-headers==2.1.0 requests==2.18.4 django-filter==1.1.0 -psycopg-binary==2.7.4 +psycopg2-binary==2.7.4 django-rest-swagger==2.2.0 coverage==4.5.2 django-nose==1.4.6