Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-05 21:45:25 +02:00
Code Issues Releases Activity

Bug/misc fixes (#618)

Browse source 
* Fixes #617

* set recipe settings default by env variables

* add variables to docker-compse

* update changelog

* bump dependencies

* add fallback name to scraper

Co-authored-by: hay-kot <hay-kot@pm.me>
This commit is contained in:
Hayden 2021-07-05 16:05:32 -08:00 • committed by GitHub
parent 3e2c9f41cf
commit 9b5cf36981
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 361 additions and 235 deletions
Download patch file Download diff file Expand all files Collapse all files

60
docs/docs/changelog/v0.5.2.md Normal file
View file

@ -0,0 +1,60 @@
# v0.5.2 - DRAFT
**App Version: v0.5.2**
**Database Version: v0.5.0**
## Bug Fixes
- Fixed #617 - Section behavior when adding a step
- Fixed #615 - Recipe Settings are not available when creating new recipe
## Features and Improvements
### General
- Recipe Instructions now collapse when checked
- Default recipe settings can be set through ENV variables
### Localization
#### Huge thanks to [@sephrat](https://github.com/sephrat) for all his work on the project. He's very consistent in his contributions to the project and nearly every release has had some of his code in it! Here's some highlights from this release
- Lazy Load Translations (Huge Performance Increase!)
- Tons of localization additions all around the site.
#### Here a list of contributors on Crowding who make Mealie possible in different locals
| Name | Languages | Translated (Words) | Target Words |
| ---------------------------- | ------------------ | :----------------: | :----------: |
| retmas-gh | Polish | 550 | 625 |
| startos | Italian | 310 | 322 |
| CMBoii | Spanish | 256 | 291 |
| sephrat | French | 255 | 296 |
| Daniel Tildeman (tildeman) | Swedish | 233 | 228 |
| Rourke | Dutch | 216 | 214 |
| Andreas Waschinski (Wascha) | German | 207 | 202 |
| wengtad | Chinese Simplified | 176 | 343 |
| Matthias Borremans (MrBorri) | Dutch | 96 | 89 |
| Adam Syndoman (pypckompsite) | Polish | 68 | 65 |
| JonasSchubert | German | 22 | 23 |
| ThrawnJL | Danish | 7 | 7 |
| NicholasBrody | Dutch | 7 | 7 |
| Giel Janssens (gieljnssns) | Dutch | 4 | 4 |
| kentora | Danish | 3 | 2 |
### Docker
#### Huge thanks to [@wengtad](https://github.com/wengtad) for all his work on improving the deployment with docker.
- Optimize Docker Dev Size (Frontend: from ~1.52GB to ~429MB | API: from ~657MB to ~380MB)
- Optimize Docker Prod Size (from ~542MB to ~373MB)
- Add Gunicorn
- Add Gunicorn and Webworkers to Dockerfile #550
- Add Docs for Gunicorn
- Add PUID/PGID to Docker. Fixes Initialization scripts fail to run when not executing as root user inside container #350,
- Not able to run correctly in docker if user permissions are specified #429
- Merge Dockerfile.dev into Dockerfile (dev shared same base together with prod)
- Add Docs for PUID/PGID
- Add Docker healthcheck (for this is not necessary, I could remove if you want)

73
docs/docs/documentation/getting-started/install.md
View file

@ -45,10 +45,18 @@ services:
PGID: 1000
TZ: America/Anchorage
# Default Recipe Settings
RECIPE_PUBLIC: true
RECIPE_SHOW_NUTRITION: true
RECIPE_SHOW_ASSETS: true
RECIPE_LANDSCAPE_VIEW: true
RECIPE_DISABLE_COMMENTS: false
RECIPE_DISABLE_AMOUNT: false
# Gunicorn
WEB_CONCURRENCY: 2
# WORKERS_PER_CORE: 0.5
# MAX_WORKERS: 8
WEB_CONCURRENCY: 2
volumes:
- ./mealie/data/:/app/data
```
@ -72,6 +80,8 @@ services:
PUID: 1000
PGID: 1000
TZ: America/Anchorage
# Database Settings
DB_ENGINE: postgres # Optional: 'sqlite', 'postgres'
POSTGRES_USER: mealie
POSTGRES_PASSWORD: mealie
@ -79,10 +89,18 @@ services:
POSTGRES_PORT: 5432
POSTGRES_DB: mealie
# Default Recipe Settings
RECIPE_PUBLIC: true
RECIPE_SHOW_NUTRITION: true
RECIPE_SHOW_ASSETS: true
RECIPE_LANDSCAPE_VIEW: true
RECIPE_DISABLE_COMMENTS: false
RECIPE_DISABLE_AMOUNT: false
# Gunicorn
WEB_CONCURRENCY: 2
# WORKERS_PER_CORE: 0.5
# MAX_WORKERS: 8
WEB_CONCURRENCY: 2
volumes:
- ./mealie/data/:/app/data
postgres:
@ -96,26 +114,33 @@ services:
## Env Variables
| Variables | Default | Description |
| ----------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
| PUID | 911 | UserID permissions between host OS and container |
| PGID | 911 | GroupID permissions between host OS and container |
| DEFAULT_GROUP | Home | The default group for users |
| DEFAULT_EMAIL | changeme@email.com | The default username for the superuser |
| BASE_URL | http://localhost:8080 | Used for Notifications |
| DB_ENGINE | sqlite | Optional: 'sqlite', 'postgres' |
| POSTGRES_USER | mealie | Postgres database user |
| POSTGRES_PASSWORD | mealie | Postgres database password |
| POSTGRES_SERVER | postgres | Postgres database server address |
| POSTGRES_PORT | 5432 | Postgres database port |
| POSTGRES_DB | mealie | Postgres database name |
| TOKEN_TIME | 2 | The time in hours that a login/auth token is valid |
| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** |
| API_DOCS | True | Turns on/off access to the API documentation locally. |
| TZ | UTC | Must be set to get correct date/time on the server |
| WORKERS_PER_CORE | 1 | Set the number of workers to the number of CPU cores multiplied by this value (Value \* CPUs). More info [here][workers_per_core] |
| MAX_WORKERS | | Set the maximum number of workers to use. Default is not set meaning unlimited. More info [here][max_workers] |
| WEB_CONCURRENCY | 2 | Override the automatic definition of number of workers. More info [here][web_concurrency] |
| Variables | Default | Description |
| ----------------------- | --------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
| PUID | 911 | UserID permissions between host OS and container |
| PGID | 911 | GroupID permissions between host OS and container |
| DEFAULT_GROUP | Home | The default group for users |
| DEFAULT_EMAIL | changeme@email.com | The default username for the superuser |
| BASE_URL | http://localhost:8080 | Used for Notifications |
| DB_ENGINE | sqlite | Optional: 'sqlite', 'postgres' |
| POSTGRES_USER | mealie | Postgres database user |
| POSTGRES_PASSWORD | mealie | Postgres database password |
| POSTGRES_SERVER | postgres | Postgres database server address |
| POSTGRES_PORT | 5432 | Postgres database port |
| POSTGRES_DB | mealie | Postgres database name |
| TOKEN_TIME | 2 | The time in hours that a login/auth token is valid |
| RECIPE_PUBLIC | True | Default Recipe Settings - Make Recipe Public |
| RECIPE_SHOW_NUTRITION | True | Default Recipe Settings - Show Recipe Nutrition |
| RECIPE_SHOW_ASSETS | True | Default Recipe Settings - Show Recipe Assets |
| RECIPE_LANDSCAPE_VIEW | True | Default Recipe Settings - Set Landscape View |
| RECIPE_DISABLE_COMMENTS | False | Default Recipe Settings - Disable Comments |
| RECIPE_DISABLE_AMOUNT | False | Default Recipe Settings - Disable Amount |
| API_PORT | 9000 | The port exposed by backend API. **Do not change this if you're running in Docker** |
| API_DOCS | True | Turns on/off access to the API documentation locally. |
| TZ | UTC | Must be set to get correct date/time on the server |
| WORKERS_PER_CORE | 1 | Set the number of workers to the number of CPU cores multiplied by this value (Value \* CPUs). More info [here][workers_per_core] |
| MAX_WORKERS | | Set the maximum number of workers to use. Default is not set meaning unlimited. More info [here][max_workers] |
| WEB_CONCURRENCY | 2 | Override the automatic definition of number of workers. More info [here][web_concurrency] |
## Raspberry Pi 4

2
docs/docs/overrides/api.html
View file

File diff suppressed because one or more lines are too long

1
docs/mkdocs.yml
View file

@ -94,6 +94,7 @@ nav:
- Style Guide: "contributors/developers-guide/style-guide.md"
- Development Road Map: "roadmap.md"
- Change Log:
- v0.5.2 Misc Updates: "changelog/v0.5.2.md"
- v0.5.1 Bug Fixes: "changelog/v0.5.1.md"
- v0.5.0 General Upgrades: "changelog/v0.5.0.md"
- v0.4.3 Hot Fix: "changelog/v0.4.3.md"