Browse Source

Funciona con docker-compose

politica
Celestino Rey 1 year ago
parent
commit
65a589dba5
31 changed files with 86 additions and 6 deletions
  1. +11
    -0
      Padel/.env.dev
  2. +3
    -0
      Padel/buildConCompose.sh
  3. +1
    -0
      Padel/creaDBCompose.sh
  4. +15
    -0
      Padel/docker-compose.yml
  5. +8
    -1
      Padel/servicios/Dockerfile
  6. +5
    -0
      Padel/servicios/entrypoint.sh
  7. +0
    -0
      Padel/servicios/padel/README.md
  8. +0
    -0
      Padel/servicios/padel/__init__.py
  9. +0
    -0
      Padel/servicios/padel/auth.py
  10. +0
    -0
      Padel/servicios/padel/basededatos.py
  11. +0
    -0
      Padel/servicios/padel/models.py
  12. +4
    -0
      Padel/servicios/padel/nginx/Dockerfile
  13. +21
    -0
      Padel/servicios/padel/nginx/nginx.conf
  14. +0
    -0
      Padel/servicios/padel/paginas.py
  15. +18
    -5
      Padel/servicios/padel/reservas.py
  16. +0
    -0
      Padel/servicios/padel/schema.sql
  17. +0
    -0
      Padel/servicios/padel/static/bulma.css
  18. +0
    -0
      Padel/servicios/padel/static/styles.css
  19. +0
    -0
      Padel/servicios/padel/templates/_navegacion.html
  20. +0
    -0
      Padel/servicios/padel/templates/autorizacion/index.html
  21. +0
    -0
      Padel/servicios/padel/templates/autorizacion/login.html
  22. +0
    -0
      Padel/servicios/padel/templates/autorizacion/profile.html
  23. +0
    -0
      Padel/servicios/padel/templates/autorizacion/signup.html
  24. +0
    -0
      Padel/servicios/padel/templates/base.html
  25. +0
    -0
      Padel/servicios/padel/templates/paginas/acerca.html
  26. +0
    -0
      Padel/servicios/padel/templates/paginas/inicio.html
  27. +0
    -0
      Padel/servicios/padel/templates/reservas/eligedia.html
  28. +0
    -0
      Padel/servicios/padel/templates/reservas/misreservas.html
  29. +0
    -0
      Padel/servicios/padel/templates/reservas/reservahoras.html
  30. +0
    -0
      Padel/servicios/padel/templates/reservas/reservar.html
  31. +0
    -0
      Padel/servicios/requirements.txt

+ 11
- 0
Padel/.env.dev View File

@ -0,0 +1,11 @@
ENVIRONMENT="Development"
FLASK_SECRET_KEY=29d3e20c7048a9d5df4f632fce4c0969fdac4e7f5334afff3ec869789a73a5d5
FLASK_DATABASE=padel.sqlite
MAIL_SERVER= 'smtp.mail.yahoo.com'
MAIL_PORT = 465
MAIL_USERNAME = 'celestino_rey@ymail.com'
MAIL_PASSWORD = 'kbryvwxkockqckss'
MAIL_USE_TLS = 'False'
MAIL_USE_SSL = 'True'

+ 3
- 0
Padel/buildConCompose.sh View File

@ -0,0 +1,3 @@
docker-compose down -v
docker rmi padel_padel
docker-compose up -d --build

+ 1
- 0
Padel/creaDBCompose.sh View File

@ -0,0 +1 @@
docker-compose exec python padel create_db

+ 15
- 0
Padel/docker-compose.yml View File

@ -0,0 +1,15 @@
version: '3.8'
services:
padel:
build: ./servicios
command: python3 -m flask --app padel run -h 0.0.0.0
volumes:
- ./padel:/usr/src/padel/
ports:
- 5001:5000
env_file:
- ./.env.dev
volumes:
postgres_data:

Padel/Dockerfile → Padel/servicios/Dockerfile View File

@ -4,11 +4,18 @@ FROM python:3.8-slim-buster
WORKDIR /padel
# set environment variables
ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
COPY requirements.txt requirements.txt
RUN pip3 install -r requirements.txt
COPY . .
CMD [ "python3", "-m" , "flask", "--app", "padel", "run", "--host=0.0.0.0"]
# CMD [ "python3", "-m" , "flask", "--app", "padel", "run", "--host=0.0.0.0"]
#CMD [ "python3", "-m" , "flask", "run", "--host=0.0.0.0"]
# run entrypoint.sh
ENTRYPOINT ["/padel/entrypoint.sh"]

+ 5
- 0
Padel/servicios/entrypoint.sh View File

@ -0,0 +1,5 @@
#!/bin/sh
python -m flask --app padel init-db
exec "$@"

Padel/padel/README.md → Padel/servicios/padel/README.md View File


Padel/padel/__init__.py → Padel/servicios/padel/__init__.py View File


Padel/padel/auth.py → Padel/servicios/padel/auth.py View File


Padel/padel/basededatos.py → Padel/servicios/padel/basededatos.py View File


Padel/padel/models.py → Padel/servicios/padel/models.py View File


+ 4
- 0
Padel/servicios/padel/nginx/Dockerfile View File

@ -0,0 +1,4 @@
FROM nginx:1.25
RUN rm /etc/nginx/conf.d/default.conf
COPY nginx.conf /etc/nginx/conf.d

+ 21
- 0
Padel/servicios/padel/nginx/nginx.conf View File

@ -0,0 +1,21 @@
upstream hello_flask {
server web:5000;
}
server {
listen 80;
location / {
proxy_pass http://hello_flask;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $host;
proxy_redirect off;
}
location /static/ {
alias /home/app/web/project/static/;
}
}

Padel/padel/paginas.py → Padel/servicios/padel/paginas.py View File


Padel/padel/reservas.py → Padel/servicios/padel/reservas.py View File

@ -6,6 +6,7 @@ from padel.basededatos import get_db
from flask_login import login_required, current_user
from flask_mail import Mail, Message
import os
import sqlite3
bp = Blueprint("reservas", __name__)
@ -109,10 +110,22 @@ def eligedia():
# borra los registros del día anterior al de hoy
db = get_db()
db.execute(
"DELETE FROM reservas WHERE fecha=?", (ayer,)
)
db.commit()
# pero antes, mete uno a una hora no usada por si acaso no hubiera
# db.execute(
# "INSERT INTO reservas (nombre, fecha, hora) VALUES (?, ?, ?)", ("-", ayer, "00:00",),
# )
# db.commit()
try:
db.execute(
"DELETE FROM reservas WHERE fecha=?", (ayer,)
)
db.commit()
except sqlite3.Error as er:
print("SQLite error: %s" %(' '.join(er.args)))
if request.method == "POST":
diaelegido = request.form['dias']
@ -140,7 +153,7 @@ def eligedia():
db.commit()
horashoy = db.execute(
"SELECT * FROM horas WHERE fecha=?", (diaelegido,)
"SELECT * FROM reservas WHERE fecha=?", (diaelegido,)
).fetchall()
db.commit()

Padel/padel/schema.sql → Padel/servicios/padel/schema.sql View File


Padel/padel/static/bulma.css → Padel/servicios/padel/static/bulma.css View File


Padel/padel/static/styles.css → Padel/servicios/padel/static/styles.css View File


Padel/padel/templates/_navegacion.html → Padel/servicios/padel/templates/_navegacion.html View File


Padel/padel/templates/autorizacion/index.html → Padel/servicios/padel/templates/autorizacion/index.html View File


Padel/padel/templates/autorizacion/login.html → Padel/servicios/padel/templates/autorizacion/login.html View File


Padel/padel/templates/autorizacion/profile.html → Padel/servicios/padel/templates/autorizacion/profile.html View File


Padel/padel/templates/autorizacion/signup.html → Padel/servicios/padel/templates/autorizacion/signup.html View File


Padel/padel/templates/base.html → Padel/servicios/padel/templates/base.html View File


Padel/padel/templates/paginas/acerca.html → Padel/servicios/padel/templates/paginas/acerca.html View File


Padel/padel/templates/paginas/inicio.html → Padel/servicios/padel/templates/paginas/inicio.html View File


Padel/padel/templates/reservas/eligedia.html → Padel/servicios/padel/templates/reservas/eligedia.html View File


Padel/padel/templates/reservas/misreservas.html → Padel/servicios/padel/templates/reservas/misreservas.html View File


Padel/padel/templates/reservas/reservahoras.html → Padel/servicios/padel/templates/reservas/reservahoras.html View File


Padel/padel/templates/reservas/reservar.html → Padel/servicios/padel/templates/reservas/reservar.html View File


Padel/requirements.txt → Padel/servicios/requirements.txt View File


Loading…
Cancel
Save