diff --git a/mealie/CHANGELOG.md b/mealie/CHANGELOG.md index c4ae5ee86..ac668ca28 100644 --- a/mealie/CHANGELOG.md +++ b/mealie/CHANGELOG.md @@ -1,5 +1,3 @@ -- Applied new homeassistant config logic, which will allow in the future all Mealie data to be backuped with the addon. All data (+ config) is moved to /addon_configs/db21ed7f_mealie ; the initial data currently in /homeassistant/addons_config/mealie_data and config in /homeassistant/addons_config/mealie will not be moved but a "migrated" file will be added to those folders to show that migration occured. From now on, only data in /addon_configs/db21ed7f_mealie will be used. - ## v2.0-beta (10-10-2024) - Switched to v2.0 beta, should hopefully solve everyone's issues! diff --git a/mealie/Dockerfile b/mealie/Dockerfile index 25c88fec1..52fc10e08 100644 --- a/mealie/Dockerfile +++ b/mealie/Dockerfile @@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Correct data path # hadolint ignore=DL4006 -RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config|g' && \ +RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' && \ sed -i "s|change_user$|# change_user|g" /app/run.sh ################## diff --git a/mealie/config.json b/mealie/config.json index 1ffce609e..2de9efa7e 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -65,7 +65,7 @@ "/dev/nvme2" ], "environment": { - "DATA_DIR": "/config", + "DATA_DIR": "/config/addons_config/mealie_data", "DB_ENGINE": "sqlite", "MAX_WORKERS": "1", "WEB_CONCURRENCY": "2", @@ -74,15 +74,14 @@ }, "image": "ghcr.io/alexbelgium/mealie-{arch}", "map": [ - "addon_config:rw", - "homeassistant_config:rw", + "config:rw", "share:rw", "ssl:rw" ], "name": "Mealie", "options": { "ALLOW_SIGNUP": true, - "DATA_DIR": "/config", + "DATA_DIR": "/config/addons_config/mealie_data", "PGID": 1000, "PUID": 1000, "certfile": "fullchain.pem", diff --git a/mealie/rootfs/run.txt b/mealie/rootfs/run.txt index 65dffae20..64714fbd9 100644 --- a/mealie/rootfs/run.txt +++ b/mealie/rootfs/run.txt @@ -35,23 +35,23 @@ done # MIGRATE DATA DIR # #################### -if [ -d /homeassistant/addons_config/mealie_data ] && [ ! -f /homeassistant/addons_config/mealie_data/migrated ]; then - bashio::log.warning "Migrating data, current data will not be touched" - cp -rnf /homeassistant/addons_config/mealie_data/* /config/ || true - touch /homeassistant/addons_config/mealie_data/migrated -fi +#if [ -d /homeassistant/addons_config/mealie_data ] && [ ! -f /homeassistant/addons_config/mealie_data/migrated ]; then +# bashio::log.warning "Migrating data, current data will not be touched" +# cp -rnf /homeassistant/addons_config/mealie_data/* /config/ || true +# touch /homeassistant/addons_config/mealie_data/migrated +#fi -if [ -f /homeassistant/addons_config/mealie/config.yaml ] && [ ! -f /homeassistant/addons_config/mealie/migrated ]; then - bashio::log.warning "Migrating config.yaml, current data will not be touched" - cp -nf /homeassistant/addons_config/mealie/config.yaml /config/ || true - touch /homeassistant/addons_config/mealie/migrated -fi +#if [ -f /homeassistant/addons_config/mealie/config.yaml ] && [ ! -f /homeassistant/addons_config/mealie/migrated ]; then +# bashio::log.warning "Migrating config.yaml, current data will not be touched" +# cp -nf /homeassistant/addons_config/mealie/config.yaml /config/ || true +# touch /homeassistant/addons_config/mealie/migrated +#fi ############### # CONFIG YAML # ############### -CONFIGSOURCE="/config/config.yaml" +CONFIGSOURCE="/config/addons_config/mealie/config.yaml" if [ -f "$CONFIGSOURCE" ]; then bashio::log.info "config.yaml found in $CONFIGSOURCE, exporting variables" diff --git a/zzz_test/Dockerfile b/zzz_test/Dockerfile index e392fdcbe..610709bfc 100644 --- a/zzz_test/Dockerfile +++ b/zzz_test/Dockerfile @@ -51,7 +51,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \ # Correct data path # hadolint ignore=DL4006 -RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config|g' && \ +RUN grep -rl "/app/data" /app | xargs sed -i 's|/app/data|/config/addons_config/mealie_data|g' && \ sed -i "s|change_user$|# change_user|g" /app/run.sh ################## diff --git a/zzz_test/config.json b/zzz_test/config.json index 7d6107fd0..648de86b6 100644 --- a/zzz_test/config.json +++ b/zzz_test/config.json @@ -65,7 +65,7 @@ "/dev/nvme2" ], "environment": { - "DATA_DIR": "/config", + "DATA_DIR": "/config/addons_config/mealie_data", "DB_ENGINE": "sqlite", "MAX_WORKERS": "1", "WEB_CONCURRENCY": "2", @@ -75,8 +75,7 @@ "image": "ghcr.io/alexbelgium/test-{arch}", "ingress": true, "map": [ - "addon_config:rw", - "homeassistant_config:rw", + "config:rw", "share:rw", "ssl:rw" ], @@ -84,7 +83,7 @@ "options": { "ALLOW_SIGNUP": true, "BASE_SUBPATH": "/mealie", - "DATA_DIR": "/config", + "DATA_DIR": "/config/addons_config/mealie_data", "PGID": 1000, "PUID": 1000, "certfile": "fullchain.pem",