avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-06-28 10:16:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "New config logic"

Browse Source 
This reverts commit 83bbab72a3.
This commit is contained in:
Alexandre
2024-10-15 12:30:01 +02:00
parent a5befaff75
commit 2f690538c0
6 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mealie/CHANGELOG.md
View File

@@ -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) ## v2.0-beta (10-10-2024)
- Switched to v2.0 beta, should hopefully solve everyone's issues! - Switched to v2.0 beta, should hopefully solve everyone's issues!

2
mealie/Dockerfile
View File

@@ -29,7 +29,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Correct data path # Correct data path
# hadolint ignore=DL4006 # 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 sed -i "s|change_user$|# change_user|g" /app/run.sh
################## ##################

7
mealie/config.json
View File

@@ -65,7 +65,7 @@
"/dev/nvme2" "/dev/nvme2"
], ],
"environment": { "environment": {
"DATA_DIR": "/config", "DATA_DIR": "/config/addons_config/mealie_data",
"DB_ENGINE": "sqlite", "DB_ENGINE": "sqlite",
"MAX_WORKERS": "1", "MAX_WORKERS": "1",
"WEB_CONCURRENCY": "2", "WEB_CONCURRENCY": "2",
@@ -74,15 +74,14 @@
}, },
"image": "ghcr.io/alexbelgium/mealie-{arch}", "image": "ghcr.io/alexbelgium/mealie-{arch}",
"map": [ "map": [
"addon_config:rw", "config:rw",
"homeassistant_config:rw",
"share:rw", "share:rw",
"ssl:rw" "ssl:rw"
], ],
"name": "Mealie", "name": "Mealie",
"options": { "options": {
"ALLOW_SIGNUP": true, "ALLOW_SIGNUP": true,
"DATA_DIR": "/config", "DATA_DIR": "/config/addons_config/mealie_data",
"PGID": 1000, "PGID": 1000,
"PUID": 1000, "PUID": 1000,
"certfile": "fullchain.pem", "certfile": "fullchain.pem",

22
mealie/rootfs/run.txt
View File

@@ -35,23 +35,23 @@ done
# MIGRATE DATA DIR # # MIGRATE DATA DIR #
#################### ####################
if [ -d /homeassistant/addons_config/mealie_data ] && [ ! -f /homeassistant/addons_config/mealie_data/migrated ]; then #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" # bashio::log.warning "Migrating data, current data will not be touched"
cp -rnf /homeassistant/addons_config/mealie_data/* /config/ || true # cp -rnf /homeassistant/addons_config/mealie_data/* /config/ || true
touch /homeassistant/addons_config/mealie_data/migrated # touch /homeassistant/addons_config/mealie_data/migrated
fi #fi
if [ -f /homeassistant/addons_config/mealie/config.yaml ] && [ ! -f /homeassistant/addons_config/mealie/migrated ]; then #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" # bashio::log.warning "Migrating config.yaml, current data will not be touched"
cp -nf /homeassistant/addons_config/mealie/config.yaml /config/ || true # cp -nf /homeassistant/addons_config/mealie/config.yaml /config/ || true
touch /homeassistant/addons_config/mealie/migrated # touch /homeassistant/addons_config/mealie/migrated
fi #fi
############### ###############
# CONFIG YAML # # CONFIG YAML #
############### ###############
CONFIGSOURCE="/config/config.yaml" CONFIGSOURCE="/config/addons_config/mealie/config.yaml"
if [ -f "$CONFIGSOURCE" ]; then if [ -f "$CONFIGSOURCE" ]; then
bashio::log.info "config.yaml found in $CONFIGSOURCE, exporting variables" bashio::log.info "config.yaml found in $CONFIGSOURCE, exporting variables"

2
zzz_test/Dockerfile
View File

@@ -51,7 +51,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
# Correct data path # Correct data path
# hadolint ignore=DL4006 # 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 sed -i "s|change_user$|# change_user|g" /app/run.sh
################## ##################

7
zzz_test/config.json
View File

@@ -65,7 +65,7 @@
"/dev/nvme2" "/dev/nvme2"
], ],
"environment": { "environment": {
"DATA_DIR": "/config", "DATA_DIR": "/config/addons_config/mealie_data",
"DB_ENGINE": "sqlite", "DB_ENGINE": "sqlite",
"MAX_WORKERS": "1", "MAX_WORKERS": "1",
"WEB_CONCURRENCY": "2", "WEB_CONCURRENCY": "2",
@@ -75,8 +75,7 @@
"image": "ghcr.io/alexbelgium/test-{arch}", "image": "ghcr.io/alexbelgium/test-{arch}",
"ingress": true, "ingress": true,
"map": [ "map": [
"addon_config:rw", "config:rw",
"homeassistant_config:rw",
"share:rw", "share:rw",
"ssl:rw" "ssl:rw"
], ],
@@ -84,7 +83,7 @@
"options": { "options": {
"ALLOW_SIGNUP": true, "ALLOW_SIGNUP": true,
"BASE_SUBPATH": "/mealie", "BASE_SUBPATH": "/mealie",
"DATA_DIR": "/config", "DATA_DIR": "/config/addons_config/mealie_data",
"PGID": 1000, "PGID": 1000,
"PUID": 1000, "PUID": 1000,
"certfile": "fullchain.pem", "certfile": "fullchain.pem",