mirror of
https://github.com/hay-kot/mealie.git
synced 2025-08-22 06:23:34 -07:00
fixed docker mount problem
This commit is contained in:
parent
35edf71b66
commit
4c8512c842
6 changed files with 26 additions and 45 deletions
|
@ -34,5 +34,5 @@ COPY --from=build-stage /app/dist /app/dist
|
||||||
RUN rm -rf /app/test /app/.temp
|
RUN rm -rf /app/test /app/.temp
|
||||||
|
|
||||||
|
|
||||||
VOLUME [ "/app_data/" ]
|
VOLUME [ "/app/data/" ]
|
||||||
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
|
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "80"]
|
||||||
|
|
|
@ -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
|
|
|
@ -10,6 +10,3 @@ services:
|
||||||
- 9090:80
|
- 9090:80
|
||||||
environment:
|
environment:
|
||||||
db_type: sqlite
|
db_type: sqlite
|
||||||
|
|
||||||
# volumes:
|
|
||||||
# - ./mealie/data/:/app/data
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ from fastapi import FastAPI
|
||||||
from fastapi.staticfiles import StaticFiles
|
from fastapi.staticfiles import StaticFiles
|
||||||
|
|
||||||
# import utils.startup as startup
|
# 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 (
|
from routes import (
|
||||||
backup_routes,
|
backup_routes,
|
||||||
debug_routes,
|
debug_routes,
|
||||||
|
@ -20,7 +20,6 @@ from routes.recipe import (
|
||||||
recipe_crud_routes,
|
recipe_crud_routes,
|
||||||
tag_routes,
|
tag_routes,
|
||||||
)
|
)
|
||||||
from utils.api_docs import generate_api_docs
|
|
||||||
from utils.logger import logger
|
from utils.logger import logger
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -15,14 +15,31 @@ def ensure_dirs():
|
||||||
ENV = CWD.joinpath(".env")
|
ENV = CWD.joinpath(".env")
|
||||||
dotenv.load_dotenv(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
|
# Helpful Globals
|
||||||
BASE_DIR = CWD
|
|
||||||
DATA_DIR = CWD.parent.joinpath("app_data")
|
DATA_DIR = CWD.parent.joinpath("app_data")
|
||||||
|
if PRODUCTION:
|
||||||
|
DATA_DIR = Path("/app/data")
|
||||||
|
|
||||||
WEB_PATH = CWD.joinpath("dist")
|
WEB_PATH = CWD.joinpath("dist")
|
||||||
IMG_DIR = DATA_DIR.joinpath("img")
|
IMG_DIR = DATA_DIR.joinpath("img")
|
||||||
BACKUP_DIR = DATA_DIR.joinpath("backups")
|
BACKUP_DIR = DATA_DIR.joinpath("backups")
|
||||||
DEBUG_DIR = DATA_DIR.joinpath("debug")
|
DEBUG_DIR = DATA_DIR.joinpath("debug")
|
||||||
MIGRATION_DIR = DATA_DIR.joinpath("migration")
|
MIGRATION_DIR = DATA_DIR.joinpath("migration")
|
||||||
|
NEXTCLOUD_DIR = MIGRATION_DIR.joinpath("nextcloud")
|
||||||
|
CHOWDOWN_DIR = MIGRATION_DIR.joinpath("chowdown")
|
||||||
TEMPLATE_DIR = DATA_DIR.joinpath("templates")
|
TEMPLATE_DIR = DATA_DIR.joinpath("templates")
|
||||||
SQLITE_DIR = DATA_DIR.joinpath("db")
|
SQLITE_DIR = DATA_DIR.joinpath("db")
|
||||||
TEMP_DIR = DATA_DIR.joinpath(".temp")
|
TEMP_DIR = DATA_DIR.joinpath(".temp")
|
||||||
|
@ -35,31 +52,23 @@ REQUIRED_DIRS = [
|
||||||
MIGRATION_DIR,
|
MIGRATION_DIR,
|
||||||
TEMPLATE_DIR,
|
TEMPLATE_DIR,
|
||||||
SQLITE_DIR,
|
SQLITE_DIR,
|
||||||
|
NEXTCLOUD_DIR,
|
||||||
|
CHOWDOWN_DIR,
|
||||||
]
|
]
|
||||||
|
|
||||||
APP_VERSION = "v0.2.0"
|
ensure_dirs()
|
||||||
# General
|
|
||||||
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
|
|
||||||
|
|
||||||
SQLITE_FILE = None
|
|
||||||
# DATABASE ENV
|
# 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":
|
if DATABASE_TYPE == "sqlite":
|
||||||
USE_SQL = True
|
USE_SQL = True
|
||||||
SQLITE_FILE = SQLITE_DIR.joinpath(f"mealie_{APP_VERSION}.sqlite")
|
SQLITE_FILE = SQLITE_DIR.joinpath(f"mealie_{APP_VERSION}.sqlite")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise Exception(
|
raise Exception(
|
||||||
"Unable to determine database type. Acceptible options are 'mongo' or 'tinydb' "
|
"Unable to determine database type. Acceptible options are 'sqlite' "
|
||||||
)
|
)
|
||||||
|
|
||||||
# Mongo Database
|
# Mongo Database
|
||||||
|
@ -72,6 +81,3 @@ DB_PORT = os.getenv("db_port", 27017)
|
||||||
# SFTP Email Stuff - For use Later down the line!
|
# SFTP Email Stuff - For use Later down the line!
|
||||||
SFTP_USERNAME = os.getenv("sftp_username", None)
|
SFTP_USERNAME = os.getenv("sftp_username", None)
|
||||||
SFTP_PASSWORD = os.getenv("sftp_password", None)
|
SFTP_PASSWORD = os.getenv("sftp_password", None)
|
||||||
|
|
||||||
|
|
||||||
ensure_dirs()
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
## Run Migration
|
|
||||||
|
|
||||||
|
|
||||||
## Start Application
|
|
||||||
uvicorn app:app --host 0.0.0.0 --port 80
|
|
Loading…
Add table
Add a link
Reference in a new issue