Versión funcionando para docker

LyricsPy/buildConComposeProd.sh

@@ -1,3 +1,3 @@
 docker-compose -f docker-compose.prod.yml down
-docker rmi lyrics_lyrics
+docker rmi lyricspy_lyrics
 docker-compose  -f docker-compose.prod.yml up -d --build

LyricsPy/docker-compose.prod.yml

@@ -3,7 +3,7 @@ version: '2.2'
 services:
   lyrics:
     build: ./servicios
-    command: gunicorn --bind 0.0.0.0:5000 app:create_app()
+    command: gunicorn --bind 0.0.0.0:5000 lyrics:create_app()
     volumes:
       - lyrics_prod:/instance
     expose:
@@ -14,7 +14,7 @@ services:
   nginx:
     build: ./servicios/nginx
     ports:
-      - 1337:80
+      - 1338:80
     depends_on:
       - lyrics
 

LyricsPy/servicios/Dockerfile

@@ -2,7 +2,7 @@
 
 FROM python:3.8-slim-buster
 
-WORKDIR /
+WORKDIR /lyrics
 
 # set environment variables
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -21,4 +21,4 @@ COPY . .
 
 
 # run entrypoint.sh
-#ENTRYPOINT ["./entrypoint.sh"]
+ENTRYPOINT ["/lyrics/entrypoint.sh"]

LyricsPy/servicios/entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec "$@"

LyricsPy/servicios/lyrics/__init__.py

@@ -0,0 +1,32 @@
+import os
+from flask import Flask
+from flask_sqlalchemy import SQLAlchemy
+
+
+from lyrics import paginas
+
+def create_app():
+    app = Flask(__name__)
+    app.config.from_prefixed_env()
+
+    app.config['SECRET_KEY'] = 'secret-key-goes-here'
+    app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///songs.db'
+
+    from .models import db
+
+    db.init_app(app)
+
+    from . import models
+
+    with app.app_context():
+        db.create_all()
+
+#    basededatos.init_app(app)
+
+    app.register_blueprint(paginas.bp)
+
+    print(f"Current Environment: {os.getenv('ENVIRONMENT')}")
+    print(f"Using Database: {app.config.get('DATABASE')}")
+
+    return app
+

LyricsPy/servicios/app.py → LyricsPy/servicios/lyrics/paginas.py

@@ -1,29 +1,20 @@
-from flask import Flask, render_template, request, redirect, url_for
-from models import db, Song, Album
+from flask import Blueprint, render_template, request, redirect, url_for
+from .models import db, Song, Album
 
-app = Flask(__name__)
-app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///songs.db'
-app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
-db.init_app(app)
+bp = Blueprint("paginas", __name__)
 
-@app.before_request
-def before_request():
-    if not hasattr(app, 'db_initialized'):
-        db.create_all()
-        app.db_initialized = True
-
-@app.route('/')
+@bp.route('/')
 def index():
     songs = Song.query.all()
     albums = Album.query.all()
     return render_template('index.html', songs=songs, albums=albums)
 
-@app.route('/song/<int:song_id>')
+@bp.route('/song/<int:song_id>')
 def song(song_id):
     song = Song.query.get_or_404(song_id)
     return render_template('song.html', song=song)
 
-@app.route('/add_song', methods=['GET', 'POST'])
+@bp.route('/add_song', methods=['GET', 'POST'])
 def add_song():
     if request.method == 'POST':
         title = request.form['title']
@@ -40,7 +31,7 @@ def add_song():
     albums = Album.query.all()
     return render_template('add_song.html', albums=albums)
 
-@app.route('/add_album', methods=['GET', 'POST'])
+@bp.route('/add_album', methods=['GET', 'POST'])
 def add_album():
     if request.method == 'POST':
         name = request.form['name']
@@ -55,13 +46,13 @@ def add_album():
     
     return render_template('add_album.html')
 
-@app.route('/album/<int:album_id>')
+@bp.route('/album/<int:album_id>')
 def album(album_id):
     album = Album.query.get_or_404(album_id)
     songs = Song.query.filter_by(album_id=album_id).all()
     return render_template('album.html', album=album, songs=songs)
 
-@app.route('/search')
+@bp.route('/search')
 def search():
     query = request.args.get('query', '')
     if query:
@@ -69,8 +60,3 @@ def search():
     else:
         songs = []
     return render_template('search.html', query=query, songs=songs)
-
-if __name__ == '__main__':
-    with app.app_context():
-        db.create_all()
-    app.run(debug=True)

LyricsPy/servicios/templates/album.html → LyricsPy/servicios/lyrics/templates/album.html

@@ -9,10 +9,10 @@
 <ul>
     {% for song in songs %}
     <li>
-        <a href="{{ url_for('song', song_id=song.id) }}">{{ song.title }} by {{ song.author }}</a>
+        <a href="{{ url_for('paginas.song', song_id=song.id) }}">{{ song.title }} by {{ song.author }}</a>
     </li>
     {% endfor %}
 </ul>
 
-<a href="{{ url_for('index') }}">Back to Home</a>
+<a href="{{ url_for('paginas.index') }}">Back to Home</a>
 {% endblock %}

LyricsPy/servicios/templates/base.html → LyricsPy/servicios/lyrics/templates/base.html

@@ -11,10 +11,10 @@
     <div class="container">
         <h1>My Song Lyrics</h1>
         <nav>
-            <a href="{{ url_for('index') }}">Home</a>
-            <a href="{{ url_for('add_song') }}">Add Song</a>
-            <a href="{{ url_for('add_album') }}">Add Album</a>
-            <form action="{{ url_for('search') }}" method="get" style="display:inline;">
+            <a href="{{ url_for('paginas.index') }}">Home</a>
+            <a href="{{ url_for('paginas.add_song') }}">Add Song</a>
+            <a href="{{ url_for('paginas.add_album') }}">Add Album</a>
+            <form action="{{ url_for('paginas.search') }}" method="get" style="display:inline;">
                 <input type="text" name="query" placeholder="Search songs...">
                 <button type="submit">Search</button>
             </form>

LyricsPy/servicios/templates/index.html → LyricsPy/servicios/lyrics/templates/index.html

@@ -20,9 +20,9 @@
         <tbody>
             {% for song in songs %}
             <tr>
-                <td><a href="{{ url_for('song', song_id=song.id) }}">{{ song.title }}</a></td>
+                <td><a href="{{ url_for('paginas.song', song_id=song.id) }}">{{ song.title }}</a></td>
                 <td>{{ song.author }}</td>
-                <td><a href="{{ url_for('album', album_id=song.album.id) }}">{{ song.album.name }}</a></td>
+                <td><a href="{{ url_for('paginas.album', album_id=song.album.id) }}">{{ song.album.name }}</a></td>
             </tr>
             {% endfor %}
         </tbody>
@@ -37,11 +37,11 @@
     <ul>
         {% for album in albums %}
         <li>
-            <a href="{{ url_for('album', album_id=album.id) }}">{{ album.name }} by {{ album.artist }} ({{ album.year }})</a>
+            <a href="{{ url_for('paginas.album', album_id=album.id) }}">{{ album.name }} by {{ album.artist }} ({{ album.year }})</a>
         </li>
         {% endfor %}
     </ul>
     <hr>
-    <a href="{{ url_for('add_album') }}" class="button">Add New Album</a>
+    <a href="{{ url_for('paginas.add_album') }}" class="button">Add New Album</a>
 </div>
 {% endblock %}

LyricsPy/servicios/templates/search.html → LyricsPy/servicios/lyrics/templates/search.html

@@ -15,9 +15,9 @@
         <tbody>
             {% for song in songs %}
             <tr>
-                <td><a href="{{ url_for('song', song_id=song.id) }}">{{ song.title }}</a></td>
+                <td><a href="{{ url_for('paginas.song', song_id=song.id) }}">{{ song.title }}</a></td>
                 <td>{{ song.author }}</td>
-                <td><a href="{{ url_for('album', album_id=song.album.id) }}">{{ song.album.name }}</a></td>
+                <td><a href="{{ url_for('paginas.album', album_id=song.album.id) }}">{{ song.album.name }}</a></td>
             </tr>
             {% endfor %}
         </tbody>
@@ -26,5 +26,5 @@
     <p>No songs found matching your query.</p>
 {% endif %}
 
-<a href="{{ url_for('index') }}">Back to Home</a>
+<a href="{{ url_for('paginas.index') }}">Back to Home</a>
 {% endblock %}

LyricsPy/servicios/requirements.txt

@@ -8,3 +8,4 @@ MarkupSafe==2.1.5
 SQLAlchemy==2.0.31
 typing_extensions==4.12.2
 Werkzeug==3.0.3
+gunicorn==22.0.0