diff --git a/LyricsPy/K8S/lyrics-deployment.yaml b/LyricsPy/K8S/lyrics-deployment.yaml index e4fcc3a..3803e80 100644 --- a/LyricsPy/K8S/lyrics-deployment.yaml +++ b/LyricsPy/K8S/lyrics-deployment.yaml @@ -36,7 +36,7 @@ spec: - --bind - 0.0.0.0:5000 - lyrics:create_app() - image: creylopez/lyrics:5.3 + image: creylopez/lyrics:5.4 name: lyrics ports: - containerPort: 5000 diff --git a/LyricsPy/buildConComposeProd.sh b/LyricsPy/buildConComposeProd.sh deleted file mode 100644 index ea769dd..0000000 --- a/LyricsPy/buildConComposeProd.sh +++ /dev/null @@ -1,4 +0,0 @@ - -docker-compose -f docker-compose.prod.yml down -docker rmi lyricspy_lyrics -docker-compose -f docker-compose.prod.yml up -d --build diff --git a/LyricsPy/docker-compose.prod.yml b/LyricsPy/docker-compose.prod.yml deleted file mode 100644 index 3ae0061..0000000 --- a/LyricsPy/docker-compose.prod.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: '2.2' - -services: - lyrics: - build: ./servicios - command: gunicorn --bind 0.0.0.0:5000 lyrics:create_app() - volumes: - - lyrics_prod:/instance - expose: - - 5000 -# env_file: -# - ./.env.prod - - nginx: - build: ./servicios/nginx - ports: - - 1338:80 - depends_on: - - lyrics - -volumes: - lyrics_prod: diff --git a/LyricsPy/index antes bulmajs.html b/LyricsPy/index antes bulmajs.html deleted file mode 100644 index f373e24..0000000 --- a/LyricsPy/index antes bulmajs.html +++ /dev/null @@ -1,88 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -
- - -
- -
-

Song List

- {% if songs %} - - - - - - - - - - - {% for song in songs %} - - - - - - - {% endfor %} - -
PistaTítuloAutorÁlbum
{{ song.pista }}{{ song.title }}{{ song.author }}{{ song.album.name }}
- {% else %} -

No songs found.

- {% endif %} -
- -
-

Album List

- {% if albums %} - - - - - - - - - - - {% for album in albums %} - - - - - - - {% endfor %} - -
CoverNombreArtistaAño
- {% if album.cover_image %} - {{ album.name }} - {% else %} - Sin imágen - {% endif %} - {{ album.name }}{{ album.artist }}{{ album.year }}
- {% else %} -

No albums found.

- {% endif %} -
- Añadir nuevo álbum -
-{% endblock %} diff --git a/LyricsPy/servicios/creaImagen.sh b/LyricsPy/servicios/creaImagen.sh index 95d171f..73c7ae8 100644 --- a/LyricsPy/servicios/creaImagen.sh +++ b/LyricsPy/servicios/creaImagen.sh @@ -1,3 +1,3 @@ -docker build --no-cache -t creylopez/lyrics:5.3 . -docker push creylopez/lyrics:5.3 +docker build --no-cache -t creylopez/lyrics:5.4 . +docker push creylopez/lyrics:5.4 diff --git a/LyricsPy/servicios/lyrics/paginas.py b/LyricsPy/servicios/lyrics/paginas.py index db00d63..dececec 100644 --- a/LyricsPy/servicios/lyrics/paginas.py +++ b/LyricsPy/servicios/lyrics/paginas.py @@ -80,6 +80,5 @@ def album(album_id): return render_template('album.html', album=album, songs=songs) @bp.route('/uploads/') -@login_required def uploaded_file(filename): return send_from_directory(current_app.config['UPLOAD_FOLDER'], filename) diff --git a/LyricsPy/servicios/nginx/Dockerfile b/LyricsPy/servicios/nginx/Dockerfile deleted file mode 100644 index 072b014..0000000 --- a/LyricsPy/servicios/nginx/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM nginx:1.25 - -RUN rm /etc/nginx/conf.d/default.conf -COPY nginx.conf /etc/nginx/conf.d \ No newline at end of file diff --git a/LyricsPy/servicios/nginx/nginx.conf b/LyricsPy/servicios/nginx/nginx.conf deleted file mode 100644 index 89d9b4b..0000000 --- a/LyricsPy/servicios/nginx/nginx.conf +++ /dev/null @@ -1,15 +0,0 @@ -upstream lyrics { - server lyrics:5000; -} - -server { - - listen 80; - - location / { - proxy_pass http://lyrics; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $host; - proxy_redirect off; - } -} \ No newline at end of file