diff --git a/Dockerfile b/Dockerfile index 67d4532..05cc1d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,15 +6,10 @@ WORKDIR /app # Copia el archivo requirements.txt al contenedor COPY requirements.txt requirements.txt +COPY app.py app.py # Instala las dependencias -RUN pip install -r requirements.txt +RUN pip install -r requirements.txt --no-cache-dir -# Copia el archivo de configuración de Jupyter -COPY jupyter_notebook_config.py /root/.jupyter/ - -# Expone el puerto 8888 para Jupyter Notebook -EXPOSE 8888 - -# Ejecuta Jupyter Notebook cuando el contenedor se inicie -CMD ["jupyter", "notebook", "--ip=0.0.0.0", "--port=8888", "--no-browser", "--allow-root"] +# Ejecuta app.py +CMD ["python", "app.py"] diff --git a/app.py b/app.py index 56a3d1e..346e6d6 100644 --- a/app.py +++ b/app.py @@ -154,7 +154,7 @@ def main(): full_panel.add_image(poster2, (aprox((0.05)*width), aprox((0.5)*height))) # full_panel.add_image(bm, (aprox(0.02*width),aprox((1/6)*height))) full_panel.get_image() - full_panel.save_image('/app/data/output.png') + full_panel.save_image('/app/data/output/images/poster.png') if __name__ == '__main__': main() \ No newline at end of file diff --git a/data/Barlow-Medium.ttf b/assets/fonts/Barlow-Medium.ttf similarity index 100% rename from data/Barlow-Medium.ttf rename to assets/fonts/Barlow-Medium.ttf diff --git a/data/output.png b/data/output.png deleted file mode 100644 index af361b8..0000000 Binary files a/data/output.png and /dev/null differ diff --git a/data/output/plate_AXBC11.png b/data/output/plate_AXBC11.png deleted file mode 100644 index bb06979..0000000 Binary files a/data/output/plate_AXBC11.png and /dev/null differ diff --git a/data/output/plate_AXBC32.png b/data/output/plate_AXBC32.png deleted file mode 100644 index 150762a..0000000 Binary files a/data/output/plate_AXBC32.png and /dev/null differ diff --git a/data/rounded_rectangle.jpg b/data/rounded_rectangle.jpg deleted file mode 100644 index 904aea2..0000000 Binary files a/data/rounded_rectangle.jpg and /dev/null differ diff --git a/requirements.txt b/requirements.txt index 389dc8c..135105f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ matplotlib -seaborn -plotly -opencv-python -jupyter +requests +Pillow +numpy \ No newline at end of file diff --git a/run_container.sh b/run_container.sh new file mode 100755 index 0000000..5e537b1 --- /dev/null +++ b/run_container.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Rutas absolutas a las carpetas locales +project_folder_path=$(pwd) +data_path=$project_folder_path/data +scripts_path=$project_folder_path/scripts +assets_path=$project_folder_path/assets + + + +# Ejecuta el contenedor con el enlace de carpeta local +docker run --rm -d -p 8888:8888 --name make_poster -v $data_path:/app/data -v $assets_path:/app/assets -v $scripts_path:/app/scripts bus_poster \ No newline at end of file diff --git a/scripts/Poster/BusPoster.py b/scripts/Poster/BusPoster.py index 3ed4ac3..86ff6e8 100644 --- a/scripts/Poster/BusPoster.py +++ b/scripts/Poster/BusPoster.py @@ -5,7 +5,7 @@ from PIL import ImageDraw, ImageFont from PIL import Image, ImageDraw, ImageFont import matplotlib.pyplot as plt import numpy as np -from MyDraw import MyDraw +from .MyDraw import MyDraw class BusPoster(MyDraw): diff --git a/scripts/Poster/MyDraw.py b/scripts/Poster/MyDraw.py index 728433e..8659cb0 100644 --- a/scripts/Poster/MyDraw.py +++ b/scripts/Poster/MyDraw.py @@ -65,7 +65,7 @@ class MyDraw(): def load_barlow(self, font_size=None): # Ruta a la fuente TTF personalizada - font_path = "/app/data/Barlow-Medium.ttf" + font_path = "/app/assets/fonts/Barlow-Medium.ttf" # Carga la fuente if font_size is None: self.font = ImageFont.truetype(font_path, self.prms['font_size']) diff --git a/scripts/Poster/TimeAnnouncement.py b/scripts/Poster/TimeAnnouncement.py index 50c6a0d..bffcd11 100644 --- a/scripts/Poster/TimeAnnouncement.py +++ b/scripts/Poster/TimeAnnouncement.py @@ -5,7 +5,7 @@ from PIL import ImageDraw, ImageFont from PIL import Image, ImageDraw, ImageFont import matplotlib.pyplot as plt import numpy as np -from MyDraw import MyDraw +from .MyDraw import MyDraw class TimeAnnouncement(MyDraw): diff --git a/scripts/Poster/BusImage.py b/scripts/old/BusImage.py similarity index 100% rename from scripts/Poster/BusImage.py rename to scripts/old/BusImage.py diff --git a/scripts/Poster/BusPlate.py b/scripts/old/BusPlate.py similarity index 100% rename from scripts/Poster/BusPlate.py rename to scripts/old/BusPlate.py diff --git a/scripts/Poster/DistanceAnnouncement.py b/scripts/old/DistanceAnnouncement.py similarity index 100% rename from scripts/Poster/DistanceAnnouncement.py rename to scripts/old/DistanceAnnouncement.py diff --git a/scripts/Poster/main.py b/scripts/old/main.py similarity index 100% rename from scripts/Poster/main.py rename to scripts/old/main.py diff --git a/scripts/Poster/main_1_2.py b/scripts/old/main_1_2.py similarity index 100% rename from scripts/Poster/main_1_2.py rename to scripts/old/main_1_2.py