From 3aded02ccfde3c49e7f123785390863bb1c47fcd Mon Sep 17 00:00:00 2001
From: Florian Dupret <florian.dupret@gmail.com>
Date: Mon, 5 Apr 2021 15:49:34 +0200
Subject: [PATCH] Fix docker dev db persistence

---
 Dockerfile.dev         | 4 ----
 docker-compose.dev.yml | 2 +-
 makefile               | 2 --
 mealie/app.py          | 4 ++++
 mealie/db/init_db.py   | 7 ++++---
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 918a7c432..bbdd699ea 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -14,12 +14,8 @@ RUN curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-
 # Copy poetry.lock* in case it doesn't exist in the repo
 COPY ./pyproject.toml /app/
 
-# RUN poetry install 
-
 COPY ./mealie /app/mealie
 
 RUN poetry install 
 
-RUN ["poetry", "run", "python", "mealie/db/init_db.py"]
-RUN ["poetry", "run", "python", "mealie/services/image/minify.py"]
 CMD ["poetry", "run", "python", "mealie/app.py"]
\ No newline at end of file
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index a55b1f07f..6e1aac0a9 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -29,7 +29,7 @@ services:
       db_type: sqlite
       TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly.
     volumes:
-      - ./app_data:/app_data
+      - ./dev/data:/app/dev/data
       - ./mealie:/app/mealie
 
   # Mkdocs
diff --git a/makefile b/makefile
index 595fe1999..195190d57 100644
--- a/makefile
+++ b/makefile
@@ -53,8 +53,6 @@ setup: ## Setup Development Instance
 	cd ..
 
 backend: ## Start Mealie Backend Development Server
-	poetry run python mealie/db/init_db.py && \
-	poetry run python mealie/services/image/minify.py && \
 	poetry run python mealie/app.py
 
 
diff --git a/mealie/app.py b/mealie/app.py
index dc664f961..135591b1e 100644
--- a/mealie/app.py
+++ b/mealie/app.py
@@ -10,6 +10,8 @@ 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",
@@ -51,6 +53,8 @@ start_scheduler()
 
 
 def main():
+    init_db.main()
+    minify.migrate_images()
 
     uvicorn.run(
         "app:app",
diff --git a/mealie/db/init_db.py b/mealie/db/init_db.py
index 11c63bd3b..2dacbf438 100644
--- a/mealie/db/init_db.py
+++ b/mealie/db/init_db.py
@@ -47,11 +47,12 @@ def default_user_init(session: Session):
     logger.info("Generating Default User")
     db.users.create(session, default_user)
 
-
-if __name__ == "__main__":
+def main():
     if sql_exists:
         print("Database Exists")
-        exit()
     else:
         print("Database Doesn't Exists, Initializing...")
         init_db()
+
+if __name__ == "__main__":
+    main()
\ No newline at end of file