diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index c7ea72e98630..368aad065d44 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -26,6 +26,7 @@ services: ports: - 9921:9000 environment: + db_type: mongo TZ: America/Anchorage # Specify Correct Timezone for Date/Time to line up correctly. db_username: root db_password: example diff --git a/docker-compose.yml b/docker-compose.yml index 181370e27e81..b79e26eb84f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,26 +7,26 @@ services: container_name: mealie restart: always ports: - - 9090:80 + - 9099:80 environment: - db_type: sql + db_type: mongo db_username: root db_password: example db_host: mongo db_port: 27017 # volumes: # - ./mealie/data/:/app/data - # mongo: - # image: mongo - # restart: always - # environment: - # MONGO_INITDB_ROOT_USERNAME: root - # MONGO_INITDB_ROOT_PASSWORD: example - # mongo-express: # Optional Mongo GUI - # image: mongo-express - # restart: always - # ports: - # - 9091:8081 - # environment: - # ME_CONFIG_MONGODB_ADMINUSERNAME: root - # ME_CONFIG_MONGODB_ADMINPASSWORD: example + mongo: + image: mongo + restart: always + environment: + MONGO_INITDB_ROOT_USERNAME: root + MONGO_INITDB_ROOT_PASSWORD: example + mongo-express: # Optional Mongo GUI + image: mongo-express + restart: always + ports: + - 9091:8081 + environment: + ME_CONFIG_MONGODB_ADMINUSERNAME: root + ME_CONFIG_MONGODB_ADMINPASSWORD: example diff --git a/mealie/db/mongo/recipe_models.py b/mealie/db/mongo/recipe_models.py index 02b4a9ba7bfe..be4c07bff395 100644 --- a/mealie/db/mongo/recipe_models.py +++ b/mealie/db/mongo/recipe_models.py @@ -13,6 +13,8 @@ class RecipeDocument(mongoengine.Document): recipeIngredient = mongoengine.ListField(required=True, default=[]) recipeInstructions = mongoengine.ListField(requiredd=True, default=[]) totalTime = mongoengine.StringField(required=False) + prepTime = mongoengine.StringField(required=False) + performTime = mongoengine.StringField(required=False) # Mealie Specific slug = mongoengine.StringField(required=True, unique=True)