mirror of
https://github.com/hay-kot/mealie.git
synced 2025-08-22 06:23:34 -07:00
Merge branch 'mealie-next' into fix/cookbook-random-recipe-selector-doesnt-work
This commit is contained in:
Mario Džoić
GitHub
commit
f85a6c0d7d
9 changed files with 68 additions and 68 deletions
|
|
@ -12,7 +12,7 @@ repos:
|
|||
exclude: ^tests/data/
|
||||
- repo: https://github.com/astral-sh/ruff-pre-commit
|
||||
# Ruff version.
|
||||
rev: v0.12.3
|
||||
rev: v0.12.4
|
||||
hooks:
|
||||
- id: ruff
|
||||
- id: ruff-format
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t
|
|||
We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do:
|
||||
|
||||
1. Take a backup just in case!
|
||||
2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.1`
|
||||
2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.0.2`
|
||||
3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access.
|
||||
4. Restart the container
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
|
|||
```yaml
|
||||
services:
|
||||
mealie:
|
||||
image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3)
|
||||
image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3)
|
||||
container_name: mealie
|
||||
restart: always
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
|
|||
```yaml
|
||||
services:
|
||||
mealie:
|
||||
image: ghcr.io/mealie-recipes/mealie:v3.0.1 # (3)
|
||||
image: ghcr.io/mealie-recipes/mealie:v3.0.2 # (3)
|
||||
container_name: mealie
|
||||
restart: always
|
||||
ports:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "mealie",
|
||||
"version": "3.0.1",
|
||||
"version": "3.0.2",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "nuxt dev",
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@
|
|||
},
|
||||
"chile pepper": {
|
||||
"aliases": [
|
||||
"capsicum"
|
||||
"peberfrugt"
|
||||
],
|
||||
"description": "",
|
||||
"name": "chilipeber",
|
||||
|
|
@ -138,38 +138,38 @@
|
|||
"pumpkin": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "pumpkin",
|
||||
"plural_name": "pumpkins"
|
||||
"name": "græskar",
|
||||
"plural_name": "græskar"
|
||||
},
|
||||
"cauliflower": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "cauliflower",
|
||||
"plural_name": "cauliflowers"
|
||||
"name": "blomkål",
|
||||
"plural_name": "blomkålshoveder"
|
||||
},
|
||||
"cabbage": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "cabbage",
|
||||
"plural_name": "cabbages"
|
||||
"plural_name": "kålhoveder"
|
||||
},
|
||||
"asparagu": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "asparagu",
|
||||
"plural_name": "asparagus"
|
||||
"name": "asparges",
|
||||
"plural_name": "asparges"
|
||||
},
|
||||
"kale": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "kale",
|
||||
"plural_name": "kales"
|
||||
"name": "grønkål",
|
||||
"plural_name": "grønkål"
|
||||
},
|
||||
"arugula": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "arugula",
|
||||
"plural_name": "arugulas"
|
||||
"name": "rucola",
|
||||
"plural_name": "rucola"
|
||||
},
|
||||
"leek": {
|
||||
"aliases": [],
|
||||
|
|
|
|||
|
|
@ -6215,7 +6215,7 @@
|
|||
"dried chili": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "dried chili",
|
||||
"name": "Getrocknete Chili",
|
||||
"plural_name": "dried chilies"
|
||||
},
|
||||
"black cardamom": {
|
||||
|
|
@ -6245,8 +6245,8 @@
|
|||
"hot paprika": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "hot paprika",
|
||||
"plural_name": "hot paprikas"
|
||||
"name": "Scharfe Paprika",
|
||||
"plural_name": "Scharfe Paprikas"
|
||||
},
|
||||
"lemon thyme": {
|
||||
"aliases": [],
|
||||
|
|
@ -6371,14 +6371,14 @@
|
|||
"vietnamese mint": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "vietnamese mint",
|
||||
"name": "Vietnamesische Minze",
|
||||
"plural_name": "vietnamese mints"
|
||||
},
|
||||
"dried orange peel": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "dried orange peel",
|
||||
"plural_name": "dried orange peels"
|
||||
"name": "Getrocknete Orangenscheiben",
|
||||
"plural_name": "Getrocknete Orangenscheiben"
|
||||
},
|
||||
"espelette pepper": {
|
||||
"aliases": [],
|
||||
|
|
@ -6868,7 +6868,7 @@
|
|||
"mango syrup": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "mango syrup",
|
||||
"name": "Mango Sirup",
|
||||
"plural_name": "mango syrups"
|
||||
},
|
||||
"malt syrup": {
|
||||
|
|
@ -7000,7 +7000,7 @@
|
|||
"chocolate sugar": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "chocolate sugar",
|
||||
"name": "Schokoladenzucker",
|
||||
"plural_name": "chocolate sugars"
|
||||
},
|
||||
"flavored syrup": {
|
||||
|
|
@ -7118,7 +7118,7 @@
|
|||
"liquid smoke": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "liquid smoke",
|
||||
"name": "flüssiger Rauch",
|
||||
"plural_name": "liquid smokes"
|
||||
},
|
||||
"poultry seasoning": {
|
||||
|
|
@ -7665,7 +7665,7 @@
|
|||
"baking powder": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "baking powder",
|
||||
"name": "Backpulver",
|
||||
"plural_name": "baking powders"
|
||||
},
|
||||
"baking soda": {
|
||||
|
|
@ -7739,7 +7739,7 @@
|
|||
"gelatin": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "gelatin",
|
||||
"name": "Gelatine",
|
||||
"plural_name": "gelatins"
|
||||
},
|
||||
"pastry flour": {
|
||||
|
|
@ -15647,19 +15647,19 @@
|
|||
"pepsi": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "pepsi",
|
||||
"plural_name": "pepsis"
|
||||
"name": "Pepsi",
|
||||
"plural_name": "Pepsis"
|
||||
},
|
||||
"cherry soda": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "cherry soda",
|
||||
"plural_name": "cherry sodas"
|
||||
"name": "Kirschlimonade",
|
||||
"plural_name": "Kirschlimonaden"
|
||||
},
|
||||
"peppermint tea": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "peppermint tea",
|
||||
"name": "Pfefferminztee",
|
||||
"plural_name": "peppermint teas"
|
||||
},
|
||||
"sports drink": {
|
||||
|
|
@ -15729,8 +15729,8 @@
|
|||
"protein powder": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "protein powder",
|
||||
"plural_name": "protein powders"
|
||||
"name": "Proteinpulver",
|
||||
"plural_name": "Proteinpulver"
|
||||
},
|
||||
"lemon extract": {
|
||||
"aliases": [],
|
||||
|
|
@ -16155,7 +16155,7 @@
|
|||
"vitamin d": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "vitamin d",
|
||||
"name": "Vitamin D",
|
||||
"plural_name": "vitamin ds"
|
||||
},
|
||||
"calcium lactate": {
|
||||
|
|
@ -16233,7 +16233,7 @@
|
|||
"thc": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "thc",
|
||||
"name": "THC",
|
||||
"plural_name": "thcs"
|
||||
},
|
||||
"berry powder": {
|
||||
|
|
@ -16299,7 +16299,7 @@
|
|||
"maltodextrin": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "maltodextrin",
|
||||
"name": "Maltodextrin",
|
||||
"plural_name": "maltodextrins"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -303,14 +303,14 @@
|
|||
"cayenne pepper": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "cayenne pepper",
|
||||
"plural_name": "cayenne peppers"
|
||||
"name": "кайенский перец",
|
||||
"plural_name": "кайенский перец"
|
||||
},
|
||||
"green tomato": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "green tomato",
|
||||
"plural_name": "green tomatoes"
|
||||
"name": "зелёный томат",
|
||||
"plural_name": "зелёные томаты"
|
||||
},
|
||||
"watercress": {
|
||||
"aliases": [],
|
||||
|
|
@ -321,76 +321,76 @@
|
|||
"iceberg": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "iceberg",
|
||||
"plural_name": "icebergs"
|
||||
"name": "салат айсберг",
|
||||
"plural_name": "салат айсберг"
|
||||
},
|
||||
"mashed potato": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "mashed potato",
|
||||
"plural_name": "mashed potatoes"
|
||||
"name": "картофельное пюре",
|
||||
"plural_name": "картофельное пюре"
|
||||
},
|
||||
"horseradish": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "horseradish",
|
||||
"plural_name": "horseradishes"
|
||||
"name": "хрен",
|
||||
"plural_name": "хрен"
|
||||
},
|
||||
"chard": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "chard",
|
||||
"plural_name": "chards"
|
||||
"name": "мангольд",
|
||||
"plural_name": "мангольд"
|
||||
},
|
||||
"pimiento": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "pimiento",
|
||||
"plural_name": "pimientoes"
|
||||
"name": "пимиенто",
|
||||
"plural_name": "пимиенто"
|
||||
},
|
||||
"spaghetti squash": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "spaghetti squash",
|
||||
"plural_name": "spaghetti squashes"
|
||||
"name": "тыква-спагетти",
|
||||
"plural_name": "тыква-спагетти"
|
||||
},
|
||||
"butter lettuce": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "butter lettuce",
|
||||
"plural_name": "butter lettuces"
|
||||
"name": "баттерхед",
|
||||
"plural_name": "баттерхед"
|
||||
},
|
||||
"hash brown": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "hash brown",
|
||||
"plural_name": "hash browns"
|
||||
"name": "хашбраун",
|
||||
"plural_name": "хашбраун"
|
||||
},
|
||||
"napa cabbage": {
|
||||
"aliases": [
|
||||
"chinese leaves"
|
||||
"китайские листья"
|
||||
],
|
||||
"description": "",
|
||||
"name": "napa cabbage",
|
||||
"plural_name": "napa cabbages"
|
||||
"name": "пекинская капуста",
|
||||
"plural_name": "пекинская капуста"
|
||||
},
|
||||
"celeriac": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "celeriac",
|
||||
"plural_name": "celeriacs"
|
||||
"name": "корень сельдерея",
|
||||
"plural_name": "корень сельдерея"
|
||||
},
|
||||
"water chestnut": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "water chestnut",
|
||||
"plural_name": "water chestnuts"
|
||||
"name": "болотница сладкая",
|
||||
"plural_name": "болотница сладкая"
|
||||
},
|
||||
"turnip": {
|
||||
"aliases": [],
|
||||
"description": "",
|
||||
"name": "turnip",
|
||||
"plural_name": "turnips"
|
||||
"name": "репа",
|
||||
"plural_name": "репа"
|
||||
},
|
||||
"thai chile pepper": {
|
||||
"aliases": [],
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ authors = ["Hayden <hay-kot@pm.me>"]
|
|||
description = "A Recipe Manager"
|
||||
license = "AGPL"
|
||||
name = "mealie"
|
||||
version = "3.0.1"
|
||||
version = "3.0.2"
|
||||
include = [
|
||||
# Explicit include to override .gitignore when packaging the frontend
|
||||
{ path = "mealie/frontend/**/*", format = ["sdist", "wheel"] }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue