diff --git a/Dockerfile.dev b/Dockerfile.dev index 918a7c432e6d..7c0745479f28 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -14,12 +14,9 @@ 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 +RUN chmod +x /app/mealie/run.sh +CMD /app/mealie/run.sh reload diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index a55b1f07fd8c..6e1aac0a9a11 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/mealie/app.py b/mealie/app.py index dc664f961316..e6223d50380f 100644 --- a/mealie/app.py +++ b/mealie/app.py @@ -51,7 +51,7 @@ start_scheduler() def main(): - + uvicorn.run( "app:app", host="0.0.0.0", diff --git a/mealie/db/init_db.py b/mealie/db/init_db.py index 11c63bd3b65b..2dacbf438c4a 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 diff --git a/mealie/run.sh b/mealie/run.sh index a6f5fc967eed..a29b4b189619 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