From 7ce43a806154efe815fa07010ceca6ae74af457c Mon Sep 17 00:00:00 2001
From: Florian Dupret <florian.dupret@gmail.com>
Date: Tue, 6 Apr 2021 13:19:47 +0200
Subject: [PATCH] Make run.sh the only startup script for prod + dev

Credits to @hay-kot for run.sh script logic
---
 Dockerfile.dev |  3 ++-
 mealie/app.py  |  6 +-----
 mealie/run.sh  | 20 ++++++++++++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index bbdd699ea..1a133f8b5 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -18,4 +18,5 @@ COPY ./mealie /app/mealie
 
 RUN poetry install 
 
-CMD ["poetry", "run", "python", "mealie/app.py"]
\ No newline at end of file
+RUN chmod +x /app/mealie/run.sh
+CMD /app/mealie/run.sh
diff --git a/mealie/app.py b/mealie/app.py
index 135591b1e..e6223d503 100644
--- a/mealie/app.py
+++ b/mealie/app.py
@@ -10,8 +10,6 @@ from mealie.routes.mealplans import mealplans
 from mealie.routes.recipe import all_recipe_routes, category_routes, recipe_crud_routes, tag_routes
 from mealie.routes.site_settings import all_settings
 from mealie.routes.users import users
-from mealie.db import init_db
-from mealie.services.image import minify
 
 app = FastAPI(
     title="Mealie",
@@ -53,9 +51,7 @@ start_scheduler()
 
 
 def main():
-    init_db.main()
-    minify.migrate_images()
-
+    
     uvicorn.run(
         "app:app",
         host="0.0.0.0",
diff --git a/mealie/run.sh b/mealie/run.sh
index a6f5fc967..b65b4f508 100755
--- a/mealie/run.sh
+++ b/mealie/run.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# Get Reload Arg `run.sh reload` for dev server
+ARG1=${1:-production}
+
 # Initialize Database Prerun
 python mealie/db/init_db.py
 python mealie/services/image/minify.py
@@ -7,8 +10,17 @@ python mealie/services/image/minify.py
 ## Migrations
 # TODO
 
-## Web Server
-caddy start --config ./Caddyfile
+if [[ "$ARG1" = "reload" ]]
+then
+    echo "Hot reload"
 
-# Start API
-uvicorn mealie.app:app --host 0.0.0.0 --port 9000
\ No newline at end of file
+    # Start API
+    uvicorn mealie.app:app --host 0.0.0.0 --port 9000 --reload
+else
+    echo "Production config"
+    # Web Server
+    caddy start --config ./Caddyfile
+
+    # Start API
+    uvicorn mealie.app:app --host 0.0.0.0 --port 9000
+fi
\ No newline at end of file