Skip to content

Commit

Permalink
Merge branch 'mealie-next' into feat/cocktail-builder
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-genson authored Nov 29, 2024
2 parents 4103294 + c0a4ae2 commit 4fa5477
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 123 deletions.
2 changes: 1 addition & 1 deletion docs/docs/documentation/community-guide/home-assistant.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Make sure the url and port (`http://mealie:9000` ) matches your installation's a

```yaml
rest:
- resource: "http://mealie:9000/api/groups/mealplans/today"
- resource: "http://mealie:9000/api/households/mealplans/today"
method: GET
headers:
Authorization: Bearer <<API_TOKEN>>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v2.2.0`
2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.3.0`
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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v2.2.0 # (3)
image: ghcr.io/mealie-recipes/mealie:v2.3.0 # (3)
container_name: mealie
restart: always
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:v2.2.0 # (3)
image: ghcr.io/mealie-recipes/mealie:v2.3.0 # (3)
container_name: mealie
restart: always
ports:
Expand Down
2 changes: 0 additions & 2 deletions frontend/components/Domain/Recipe/RecipeContextMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@
<v-text-field
v-model="newMealdate"
:label="$t('general.date')"
:hint="$t('recipe.date-format-hint')"
persistent-hint
:prepend-icon="$globals.icons.calendar"
v-bind="attrs"
readonly
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mealie",
"version": "2.2.0",
"version": "2.3.0",
"private": true,
"scripts": {
"dev": "nuxt",
Expand Down
237 changes: 122 additions & 115 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ authors = ["Hayden <[email protected]>"]
description = "A Recipe Manager"
license = "AGPL"
name = "mealie"
version = "2.2.0"
version = "2.3.0"

[tool.poetry.scripts]
start = "mealie.app:main"
Expand Down

0 comments on commit 4fa5477

Please sign in to comment.