diff --git a/Libros/.dockerignore b/Libros/.dockerignore index 9c7ebe6..d30feaf 100644 --- a/Libros/.dockerignore +++ b/Libros/.dockerignore @@ -1,2 +1,4 @@ Dockerfile Makefile +libro.sql +Pipfile* diff --git a/Libros/Dockerfile b/Libros/Dockerfile index b70f962..36ee45b 100644 --- a/Libros/Dockerfile +++ b/Libros/Dockerfile @@ -23,8 +23,8 @@ RUN mkdir -p /app # create the appropriate directories ENV APP_HOME=/app RUN mkdir -p $APP_HOME -RUN mkdir -p $APP_HOME/staticfiles -RUN mkdir -p $APP_HOME/mediafiles +#RUN mkdir -p $APP_HOME/staticfiles +#RUN mkdir -p $APP_HOME/mediafiles WORKDIR $APP_HOME RUN pip install --upgrade pip diff --git a/Libros/K8S/Makefile b/Libros/K8S/Makefile index c3d53bc..8845631 100644 --- a/Libros/K8S/Makefile +++ b/Libros/K8S/Makefile @@ -1,5 +1,5 @@ export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':') -export IMG_VERSION = 1.17 +export IMG_VERSION = 1.20 export IMG_NGINX_VERSION = 1.17 # limpia todo diff --git a/Libros/K8S/env-prod-configmap.yaml b/Libros/K8S/env-prod-configmap.yaml index e664454..890bf42 100644 --- a/Libros/K8S/env-prod-configmap.yaml +++ b/Libros/K8S/env-prod-configmap.yaml @@ -1,7 +1,7 @@ apiVersion: v1 data: DEBUG: "0" - DJANGO_ALLOWED_HOSTS: localhost 127.0.0.1 [::1] + DJANGO_ALLOWED_HOSTS: k8s-server localhost 127.0.0.1 [::1] SECRET_KEY: change_me kind: ConfigMap metadata: diff --git a/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped.jpg b/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped.jpg and /dev/null differ diff --git a/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg b/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg and /dev/null differ diff --git a/Libros/biblioteca/autores/auster.jpg b/Libros/biblioteca/autores/auster.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/autores/auster.jpg and /dev/null differ diff --git a/Libros/biblioteca/autores/daniel.jpg b/Libros/biblioteca/autores/daniel.jpg deleted file mode 100644 index d7775bd..0000000 Binary files a/Libros/biblioteca/autores/daniel.jpg and /dev/null differ diff --git a/Libros/biblioteca/autores/daniel_Tk9mZbV.jpg b/Libros/biblioteca/autores/daniel_Tk9mZbV.jpg deleted file mode 100644 index d7775bd..0000000 Binary files a/Libros/biblioteca/autores/daniel_Tk9mZbV.jpg and /dev/null differ diff --git a/Libros/biblioteca/biblioteca/settings.py b/Libros/biblioteca/biblioteca/settings.py index 525451c..742f44b 100644 --- a/Libros/biblioteca/biblioteca/settings.py +++ b/Libros/biblioteca/biblioteca/settings.py @@ -135,7 +135,7 @@ LOGOUT_REDIRECT_URL = 'principal' AUTH_USER_MODEL = "gestion.ReyMotaUser" -MEDIA_ROOT = os.path.join(BASE_DIR, 'media/') # 'media' is my media folder +MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles/') # 'media' is my media folder LOGGING = { diff --git a/Libros/biblioteca/datos/libros.sqlite3 b/Libros/biblioteca/datos/libros.sqlite3 deleted file mode 100644 index f27edd6..0000000 Binary files a/Libros/biblioteca/datos/libros.sqlite3 and /dev/null differ diff --git a/Libros/biblioteca/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub b/Libros/biblioteca/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub deleted file mode 100644 index c7ba50f..0000000 Binary files a/Libros/biblioteca/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub and /dev/null differ diff --git a/Libros/biblioteca/libros/Invisible_-_Paul_Auster_5.epub b/Libros/biblioteca/libros/Invisible_-_Paul_Auster_5.epub deleted file mode 100644 index 6469261..0000000 Binary files a/Libros/biblioteca/libros/Invisible_-_Paul_Auster_5.epub and /dev/null differ diff --git a/Libros/biblioteca/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub b/Libros/biblioteca/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub deleted file mode 100644 index 4884491..0000000 Binary files a/Libros/biblioteca/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub and /dev/null differ diff --git a/Libros/biblioteca/libros/Sunset_Park_-_Paul_Auster_12.epub b/Libros/biblioteca/libros/Sunset_Park_-_Paul_Auster_12.epub deleted file mode 100644 index dcb4e04..0000000 Binary files a/Libros/biblioteca/libros/Sunset_Park_-_Paul_Auster_12.epub and /dev/null differ diff --git a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped.jpg b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_5U31hTv.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx_g5Iu4YX.jpg b/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx_g5Iu4YX.jpg deleted file mode 100644 index 8043105..0000000 Binary files a/Libros/biblioteca/media/autores/220px-Yuval_Noah_Harari_cropped_LijFJPx_g5Iu4YX.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/auster.jpg b/Libros/biblioteca/media/autores/auster.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/media/autores/auster.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/auster_JFrSlOb.jpg b/Libros/biblioteca/media/autores/auster_JFrSlOb.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/media/autores/auster_JFrSlOb.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/auster_UR5oLPj.jpg b/Libros/biblioteca/media/autores/auster_UR5oLPj.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/media/autores/auster_UR5oLPj.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/auster_VFzZqcM.jpg b/Libros/biblioteca/media/autores/auster_VFzZqcM.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/media/autores/auster_VFzZqcM.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/auster_hjNgjmW.jpg b/Libros/biblioteca/media/autores/auster_hjNgjmW.jpg deleted file mode 100644 index 6c22542..0000000 Binary files a/Libros/biblioteca/media/autores/auster_hjNgjmW.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/daniel.jpg b/Libros/biblioteca/media/autores/daniel.jpg deleted file mode 100644 index d7775bd..0000000 Binary files a/Libros/biblioteca/media/autores/daniel.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/autores/daniel_Tk9mZbV.jpg b/Libros/biblioteca/media/autores/daniel_Tk9mZbV.jpg deleted file mode 100644 index d7775bd..0000000 Binary files a/Libros/biblioteca/media/autores/daniel_Tk9mZbV.jpg and /dev/null differ diff --git a/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub b/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub deleted file mode 100644 index c7ba50f..0000000 Binary files a/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234.epub and /dev/null differ diff --git a/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub b/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub deleted file mode 100644 index c7ba50f..0000000 Binary files a/Libros/biblioteca/media/libros/21_lecciones_para_el_siglo_XXI_-_Yuval_Noah_Harari_234_YeZB9yy.epub and /dev/null differ diff --git a/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub b/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub deleted file mode 100644 index 4884491..0000000 Binary files a/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99.epub and /dev/null differ diff --git a/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99_smWZOuv.epub b/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99_smWZOuv.epub deleted file mode 100644 index 4884491..0000000 Binary files a/Libros/biblioteca/media/libros/Palacio_de_la_Luna_El_-_Auster_Paul_99_smWZOuv.epub and /dev/null differ diff --git a/Libros/biblioteca/media/libros/Sunset_Park_-_Paul_Auster_12.epub b/Libros/biblioteca/media/libros/Sunset_Park_-_Paul_Auster_12.epub deleted file mode 100644 index dcb4e04..0000000 Binary files a/Libros/biblioteca/media/libros/Sunset_Park_-_Paul_Auster_12.epub and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/foto.jpeg b/Libros/biblioteca/media/portadas/foto.jpeg deleted file mode 100644 index 464838d..0000000 Binary files a/Libros/biblioteca/media/portadas/foto.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/lecciones.jpeg b/Libros/biblioteca/media/portadas/lecciones.jpeg deleted file mode 100644 index 7422ee5..0000000 Binary files a/Libros/biblioteca/media/portadas/lecciones.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/lecciones_NYOL9o4.jpeg b/Libros/biblioteca/media/portadas/lecciones_NYOL9o4.jpeg deleted file mode 100644 index 7422ee5..0000000 Binary files a/Libros/biblioteca/media/portadas/lecciones_NYOL9o4.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/palacio.jpeg b/Libros/biblioteca/media/portadas/palacio.jpeg deleted file mode 100644 index df52665..0000000 Binary files a/Libros/biblioteca/media/portadas/palacio.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/palacio_8NDDCXJ.jpeg b/Libros/biblioteca/media/portadas/palacio_8NDDCXJ.jpeg deleted file mode 100644 index df52665..0000000 Binary files a/Libros/biblioteca/media/portadas/palacio_8NDDCXJ.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/portadas/sunsetpark.jpeg b/Libros/biblioteca/media/portadas/sunsetpark.jpeg deleted file mode 100644 index 0f249cd..0000000 Binary files a/Libros/biblioteca/media/portadas/sunsetpark.jpeg and /dev/null differ diff --git a/Libros/biblioteca/media/profile_images/gravatar-tino.jpeg b/Libros/biblioteca/media/profile_images/gravatar-tino.jpeg deleted file mode 100644 index 98ef9b0..0000000 Binary files a/Libros/biblioteca/media/profile_images/gravatar-tino.jpeg and /dev/null differ diff --git a/Libros/entrypoint.sh b/Libros/entrypoint.sh index 0d30599..b6c5775 100755 --- a/Libros/entrypoint.sh +++ b/Libros/entrypoint.sh @@ -1,6 +1,6 @@ #!/bin/bash -python manage.py flush --no-input +#python manage.py flush --no-input python manage.py migrate exec "$@"