diff --git a/Dockerfile b/Dockerfile index 3189e658c..f1a52568c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,5 +34,5 @@ COPY --from=build-stage /app/dist /app/dist RUN rm -rf /app/test /app/.temp -VOLUME [ "/app_data/" ] +VOLUME [ "/app/data/" ] CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"] diff --git a/docker-compose.arm.yml b/docker-compose.arm.yml deleted file mode 100644 index 5c7bc88de..000000000 --- a/docker-compose.arm.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Use root/example as user/password credentials -# Frontend/Backend Served via the same Uvicorn Server -version: "3.1" -services: - mealie: - build: - context: ./ - dockerfile: Dockerfile.arm - container_name: mealie - restart: always - ports: - - 9090:80 - environment: - db_type: sql - volumes: - - ./mealie/data/:/app/data diff --git a/docker-compose.yml b/docker-compose.yml index 22f78041d..457f81576 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,3 @@ services: - 9090:80 environment: db_type: sqlite - - # volumes: - # - ./mealie/data/:/app/data diff --git a/mealie/app.py b/mealie/app.py index 29f2fe347..e50333784 100644 --- a/mealie/app.py +++ b/mealie/app.py @@ -3,7 +3,7 @@ from fastapi import FastAPI from fastapi.staticfiles import StaticFiles # import utils.startup as startup -from app_config import PORT, PRODUCTION, WEB_PATH, docs_url, redoc_url +from app_config import CWD, DATA_DIR, PORT, PRODUCTION, WEB_PATH, docs_url, redoc_url from routes import ( backup_routes, debug_routes, @@ -20,7 +20,6 @@ from routes.recipe import ( recipe_crud_routes, tag_routes, ) -from utils.api_docs import generate_api_docs from utils.logger import logger """ diff --git a/mealie/app_config.py b/mealie/app_config.py index 608ebafe2..5c1d354ac 100644 --- a/mealie/app_config.py +++ b/mealie/app_config.py @@ -15,14 +15,31 @@ def ensure_dirs(): ENV = CWD.joinpath(".env") dotenv.load_dotenv(ENV) +# General +APP_VERSION = "v0.2.0" +PRODUCTION = os.environ.get("ENV") +PORT = int(os.getenv("mealie_port", 9000)) +API = os.getenv("api_docs", True) + +if API: + docs_url = "/docs" + redoc_url = "/redoc" +else: + docs_url = None + redoc_url = None + # Helpful Globals -BASE_DIR = CWD DATA_DIR = CWD.parent.joinpath("app_data") +if PRODUCTION: + DATA_DIR = Path("/app/data") + WEB_PATH = CWD.joinpath("dist") IMG_DIR = DATA_DIR.joinpath("img") BACKUP_DIR = DATA_DIR.joinpath("backups") DEBUG_DIR = DATA_DIR.joinpath("debug") MIGRATION_DIR = DATA_DIR.joinpath("migration") +NEXTCLOUD_DIR = MIGRATION_DIR.joinpath("nextcloud") +CHOWDOWN_DIR = MIGRATION_DIR.joinpath("chowdown") TEMPLATE_DIR = DATA_DIR.joinpath("templates") SQLITE_DIR = DATA_DIR.joinpath("db") TEMP_DIR = DATA_DIR.joinpath(".temp") @@ -35,31 +52,23 @@ REQUIRED_DIRS = [ MIGRATION_DIR, TEMPLATE_DIR, SQLITE_DIR, + NEXTCLOUD_DIR, + CHOWDOWN_DIR, ] -APP_VERSION = "v0.2.0" -# General -PRODUCTION = os.environ.get("ENV") -PORT = int(os.getenv("mealie_port", 9000)) -API = os.getenv("api_docs", True) +ensure_dirs() -if API: - docs_url = "/docs" - redoc_url = "/redoc" -else: - docs_url = None - redoc_url = None -SQLITE_FILE = None # DATABASE ENV -DATABASE_TYPE = os.getenv("db_type", "sqlite") # mongo, sqlite +SQLITE_FILE = None +DATABASE_TYPE = os.getenv("db_type", "sqlite") if DATABASE_TYPE == "sqlite": USE_SQL = True SQLITE_FILE = SQLITE_DIR.joinpath(f"mealie_{APP_VERSION}.sqlite") else: raise Exception( - "Unable to determine database type. Acceptible options are 'mongo' or 'tinydb' " + "Unable to determine database type. Acceptible options are 'sqlite' " ) # Mongo Database @@ -72,6 +81,3 @@ DB_PORT = os.getenv("db_port", 27017) # SFTP Email Stuff - For use Later down the line! SFTP_USERNAME = os.getenv("sftp_username", None) SFTP_PASSWORD = os.getenv("sftp_password", None) - - -ensure_dirs() diff --git a/mealie/run.sh b/mealie/run.sh deleted file mode 100644 index b90769efc..000000000 --- a/mealie/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -## Run Migration - - -## Start Application -uvicorn app:app --host 0.0.0.0 --port 80 \ No newline at end of file