diff --git a/Dockerfile.dev b/Dockerfile.dev index 918a7c432..7c0745479 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 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/frontend/src/components/Login/LoginForm.vue b/frontend/src/components/Login/LoginForm.vue index b2cc18981..1cb48b729 100644 --- a/frontend/src/components/Login/LoginForm.vue +++ b/frontend/src/components/Login/LoginForm.vue @@ -22,13 +22,11 @@ /dev/null && pwd )" # # Initialize Database Prerun @@ -12,6 +12,8 @@ poetry run python $DIR/services/image/minify.py # Migrations # TODO + # Migrations + # Set Port from ENV Variable if [[ "$ARG1" = "reload" ]] then