mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-09-28 20:34:00 +02:00
Compare commits
2 Commits
c6a55ea5f4
...
ai-fix/wge
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
acfa7ec0fa | ||
|
|
c30629aa8b |
@@ -1,8 +1,4 @@
|
|||||||
|
|
||||||
## v3.25.1 (2026-09-05)
|
|
||||||
- Update to latest version from mealie-recipes/mealie (changelog : https://github.com/mealie-recipes/mealie/releases)
|
|
||||||
- Build the ingress frontend with pnpm and the upstream lockfile: upstream dropped frontend/yarn.lock in v3.24.0, so the previous yarn install resolved dependencies unpinned and the build broke on a vuetify release without "vuetify/labs/rules"
|
|
||||||
|
|
||||||
## v3.24.0 (2026-08-29)
|
## v3.24.0 (2026-08-29)
|
||||||
- Update to latest version from mealie-recipes/mealie (changelog : https://github.com/mealie-recipes/mealie/releases)
|
- Update to latest version from mealie-recipes/mealie (changelog : https://github.com/mealie-recipes/mealie/releases)
|
||||||
|
|
||||||
|
|||||||
@@ -15,30 +15,24 @@
|
|||||||
#################
|
#################
|
||||||
|
|
||||||
# Stage 1: Build Frontend with SUB_PATH
|
# Stage 1: Build Frontend with SUB_PATH
|
||||||
# Mirrors upstream docker/Dockerfile: node:24 + pnpm, installing from the
|
FROM node:22 AS frontend-builder
|
||||||
# committed pnpm-lock.yaml. Upstream dropped frontend/yarn.lock in v3.24.0, so a
|
|
||||||
# yarn install here resolved every dependency fresh and eventually picked a
|
|
||||||
# vuetify release without "vuetify/labs/rules", breaking "nuxt generate".
|
|
||||||
FROM node:24 AS frontend-builder
|
|
||||||
|
|
||||||
# Set the SUB_PATH environment variable
|
# Set the SUB_PATH environment variable
|
||||||
ARG SUB_PATH="/mealie/"
|
ARG SUB_PATH="/mealie/"
|
||||||
ENV SUB_PATH=$SUB_PATH
|
ENV SUB_PATH=$SUB_PATH
|
||||||
|
|
||||||
ENV MEALIE_VERSION="v3.25.1"
|
ENV MEALIE_VERSION="v3.24.0"
|
||||||
|
|
||||||
RUN npm install --global pnpm@11
|
|
||||||
|
|
||||||
# Clone the Mealie repository to get the frontend source code
|
# Clone the Mealie repository to get the frontend source code
|
||||||
WORKDIR /frontend
|
WORKDIR /frontend
|
||||||
# hadolint ignore=DL3003
|
# hadolint ignore=DL3003
|
||||||
RUN mkdir -p /frontend/tempdir && cd /frontend/tempdir && \
|
RUN mkdir -p /frontend/tempdir && cd /frontend/tempdir && \
|
||||||
git clone --depth 1 --branch "$MEALIE_VERSION" https://github.com/mealie-recipes/mealie.git . && \
|
git clone --branch "$MEALIE_VERSION" https://github.com/mealie-recipes/mealie.git . && \
|
||||||
cp -a frontend/. /frontend/ && cd /frontend && rm -rf tempdir && \
|
cp -rf frontend/* /frontend && cd /frontend && rm -rf tempdir && \
|
||||||
pnpm install --frozen-lockfile
|
yarn install --prefer-offline --frozen-lockfile --non-interactive --production=false --network-timeout 1000000
|
||||||
|
|
||||||
# Build the frontend
|
# Build the frontend
|
||||||
RUN pnpm generate
|
RUN yarn generate
|
||||||
|
|
||||||
# Stage 2: Build the Final Image
|
# Stage 2: Build the Final Image
|
||||||
FROM hkotel/mealie:latest
|
FROM hkotel/mealie:latest
|
||||||
|
|||||||
@@ -114,4 +114,4 @@ schema:
|
|||||||
slug: mealie
|
slug: mealie
|
||||||
udev: true
|
udev: true
|
||||||
url: https://github.com/alexbelgium/hassio-addons
|
url: https://github.com/alexbelgium/hassio-addons
|
||||||
version: "v3.25.1"
|
version: "v3.24.0"
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"github_beta": "true",
|
"github_beta": "true",
|
||||||
"github_fulltag": "true",
|
"github_fulltag": "true",
|
||||||
"last_update": "2026-09-05",
|
"last_update": "2026-08-29",
|
||||||
"paused": "false",
|
"paused": "false",
|
||||||
"repository": "alexbelgium/hassio-addons",
|
"repository": "alexbelgium/hassio-addons",
|
||||||
"slug": "mealie",
|
"slug": "mealie",
|
||||||
"source": "github",
|
"source": "github",
|
||||||
"upstream_repo": "mealie-recipes/mealie",
|
"upstream_repo": "mealie-recipes/mealie",
|
||||||
"upstream_version": "v3.25.1"
|
"upstream_version": "v3.24.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
## 2.6.4 (2026-09-04)
|
## 2.6.4 (2026-09-05)
|
||||||
|
|
||||||
- Fix the add-on failing to start on a fresh install with `django.core.exceptions.ImproperlyConfigured: Set the DJANGO_DB_ENGINE environment variable`. The upstream `wger/server` image stopped shipping database defaults, and `settings/main.py` reads `DJANGO_DB_ENGINE` and `DJANGO_DB_DATABASE` with no fallback, so the add-on now sets them explicitly to sqlite at `/data/database.sqlite` — the same location the previous startup rewrite produced, so existing databases keep working.
|
- Fix the add-on failing to start with `ImproperlyConfigured: Set the DJANGO_DB_ENGINE environment variable`: wger 2.7 removed the implicit sqlite fallback from its settings, so the database is now declared explicitly through `DJANGO_DB_ENGINE` / `DJANGO_DB_DATABASE`, still pointing at the persistent `/data/database.sqlite`
|
||||||
- Set `DJANGO_PERFORM_MIGRATIONS=True`, as upstream's own docker deployment does, so an existing database gets new migrations applied when the add-on is rebuilt against a newer upstream release.
|
- Replace the misleading "Unable to find Python settings containing database path" warning with an informational message, as wger no longer hardcodes that path
|
||||||
- Drop the startup rewrite of the database path in the Python settings: upstream no longer hardcodes `/home/wger/db/database.sqlite` anywhere, so the rewrite silently did nothing and only logged a warning.
|
|
||||||
- ⚠ MAJOR CHANGE : switch to the new config logic from homeassistant. Your configuration file will have migrated from /config/addons_config/wger to a folder only accessible from my Filebrowser addon called /addon_configs/xxx-wger. This avoids the addon to mess with your homeassistant configuration folder, and allows to backup the options. Migration is automatic only for a config.yaml sitting at the default /config/addons_config/wger/config.yaml. If you had pointed CONFIG_LOCATION somewhere else inside the homeassistant config folder, or had a custom script at /homeassistant/addons_autoscripts/wger.sh, move the file to /addon_configs/xxx-wger/ by hand and update the option. Please be sure to update all your links ! For more information, see here : https://developers.home-assistant.io/blog/2023/11/06/public-addon-config/
|
|
||||||
|
|
||||||
## 2.6.3 (2026-08-01)
|
## 2.6.3 (2026-08-01)
|
||||||
|
|
||||||
|
|||||||
@@ -28,17 +28,24 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
|||||||
S6_SERVICES_GRACETIME=0
|
S6_SERVICES_GRACETIME=0
|
||||||
|
|
||||||
|
|
||||||
# The upstream image no longer ships database defaults; settings/main.py reads
|
|
||||||
# DJANGO_DB_ENGINE and DJANGO_DB_DATABASE with no fallback, so they must be set here
|
|
||||||
ENV SYNC_EXERCISES_ON_STARTUP=True \
|
ENV SYNC_EXERCISES_ON_STARTUP=True \
|
||||||
DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True \
|
DOWNLOAD_EXERCISE_IMAGES_ON_STARTUP=True \
|
||||||
FROM_EMAIL='wger Workout Manager <wger@example.com>' \
|
FROM_EMAIL='wger Workout Manager <wger@example.com>' \
|
||||||
DJANGO_DB_ENGINE="django.db.backends.sqlite3" \
|
|
||||||
DJANGO_DB_DATABASE="/data/database.sqlite" \
|
|
||||||
DJANGO_PERFORM_MIGRATIONS=True \
|
|
||||||
DJANGO_MEDIA_ROOT="/data/media" \
|
DJANGO_MEDIA_ROOT="/data/media" \
|
||||||
DJANGO_STATIC_ROOT="/data/static"
|
DJANGO_STATIC_ROOT="/data/static"
|
||||||
|
|
||||||
|
# wger 2.7 dropped the implicit sqlite fallback in settings/main.py, so the
|
||||||
|
# database has to be declared through the environment or Django aborts with
|
||||||
|
# "Set the DJANGO_DB_ENGINE environment variable".
|
||||||
|
# USER/PASSWORD/HOST/PORT are ignored by the sqlite backend; they are set
|
||||||
|
# because wger 2.6 read them without a default, so both base images boot.
|
||||||
|
ENV DJANGO_DB_ENGINE="django.db.backends.sqlite3" \
|
||||||
|
DJANGO_DB_DATABASE="/data/database.sqlite" \
|
||||||
|
DJANGO_DB_USER="" \
|
||||||
|
DJANGO_DB_PASSWORD="" \
|
||||||
|
DJANGO_DB_HOST="" \
|
||||||
|
DJANGO_DB_PORT="5432"
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
RUN echo "wger ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
|
RUN echo "wger ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \
|
||||||
|
|||||||
@@ -5,13 +5,12 @@ description: manage your personal workouts, weight and diet plans
|
|||||||
image: ghcr.io/alexbelgium/wger-{arch}
|
image: ghcr.io/alexbelgium/wger-{arch}
|
||||||
map:
|
map:
|
||||||
- share:rw
|
- share:rw
|
||||||
- addon_config:rw
|
- config:rw
|
||||||
- homeassistant_config:rw
|
|
||||||
- ssl:ro
|
- ssl:ro
|
||||||
name: Wger
|
name: Wger
|
||||||
options:
|
options:
|
||||||
env_vars: []
|
env_vars: []
|
||||||
CONFIG_LOCATION: /config/config.yaml
|
CONFIG_LOCATION: /config/addons_config/wger/config.yaml
|
||||||
ports:
|
ports:
|
||||||
80/tcp: 9927
|
80/tcp: 9927
|
||||||
ports_description:
|
ports_description:
|
||||||
|
|||||||
@@ -51,6 +51,25 @@ migrate_database() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
############################
|
||||||
|
# Change database location #
|
||||||
|
############################
|
||||||
|
echo "... set database path"
|
||||||
|
mapfile -t SETTINGS_FILES < <(grep -rl --include='*.py' '/home/wger/db/database.sqlite' /home 2> /dev/null || true)
|
||||||
|
|
||||||
|
if [ "${#SETTINGS_FILES[@]}" -gt 0 ]; then
|
||||||
|
for settings_file in "${SETTINGS_FILES[@]}"; do
|
||||||
|
sed -i "s|/home/wger/db/database.sqlite|/data/database.sqlite|g" "$settings_file"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
# Expected on wger >= 2.7: the settings no longer hardcode a database path,
|
||||||
|
# it comes from the environment instead. Which variable wins is decided by
|
||||||
|
# wger, not here: PS_DATABASE_URI takes precedence over the DJANGO_DB_*
|
||||||
|
# defaults set in the Dockerfile, so no single one is named, and no value
|
||||||
|
# is logged (PS_DATABASE_URI carries credentials).
|
||||||
|
bashio::log.info "Settings do not hardcode a database path, the database is taken from the environment"
|
||||||
|
fi
|
||||||
|
|
||||||
#####################
|
#####################
|
||||||
# Adapt directories #
|
# Adapt directories #
|
||||||
#####################
|
#####################
|
||||||
|
|||||||
Reference in New Issue
Block a user