From f3697b17ff475702b5c2ab361d7f3c73344b8417 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:20:41 +0100 Subject: [PATCH 01/11] Update automatic_packages.sh --- zzz_templates/automatic_packages.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/zzz_templates/automatic_packages.sh b/zzz_templates/automatic_packages.sh index b75ee6a1e..4e5076b97 100644 --- a/zzz_templates/automatic_packages.sh +++ b/zzz_templates/automatic_packages.sh @@ -116,6 +116,13 @@ for files in "/etc/cont-init.d" "/etc/services.d"; do [ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES sqlite3" fi + COMMAND="mysql" + if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &>/dev/null; then + [ "$VERBOSE" = true ] && echo "$COMMAND required" + [ "$PACKMANAGER" = "apk" ] && PACKAGES="$PACKAGES mysql-client" + [ "$PACKMANAGER" = "apt" ] && PACKAGES="$PACKAGES mysql-client" + fi + COMMAND="pip" if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &>/dev/null; then [ "$VERBOSE" = true ] && echo "$COMMAND required" From b95ae94c2be67ee2be2da260bde51447ed740663 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:21:37 +0100 Subject: [PATCH 02/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index a28550506..46adc60b9 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -30,6 +30,8 @@ mariadb_addon) "Please ensure it is installed and started" fi + # Do not delete this comment : install mysql client + # Use values export DB_ENGINE=django.db.backends.mysql export POSTGRES_HOST=$(bashio::services "mysql" "host") && bashio::log.blue "POSTGRES_HOST=$POSTGRES_HOST" From ce7a11287584ce499dfe05bc18c2ef871ad70ff4 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:21:49 +0100 Subject: [PATCH 03/11] Update config.json --- tandoor_recipes/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 3048f590c..b68a282f0 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -33,6 +33,6 @@ "slug": "tandoor_recipes", "upstream": "1.0.4", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.0.4-4", + "version": "1.0.4-5", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } From 75ab2435d2ef8f697d836c6241ea1c1728761d31 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 12:24:02 +0100 Subject: [PATCH 04/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index 46adc60b9..15a02b008 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -30,8 +30,9 @@ mariadb_addon) "Please ensure it is installed and started" fi - # Do not delete this comment : install mysql client - + # Install mysqlclient + pip install mysqlclient + # Use values export DB_ENGINE=django.db.backends.mysql export POSTGRES_HOST=$(bashio::services "mysql" "host") && bashio::log.blue "POSTGRES_HOST=$POSTGRES_HOST" From 5bdfa3dc05e4b8fcc78c48f307810d4492819a04 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:09:07 +0100 Subject: [PATCH 05/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index 15a02b008..49e2cf58d 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -31,7 +31,7 @@ mariadb_addon) fi # Install mysqlclient - pip install mysqlclient + pip install mysql-connector-python &>/dev/null || pip install pymysql &>/dev/null # Use values export DB_ENGINE=django.db.backends.mysql From 7819bb1d9ef39003521b530fe39d5d9da0b8150b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:45:59 +0100 Subject: [PATCH 06/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index 49e2cf58d..ca3e27926 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -31,7 +31,7 @@ mariadb_addon) fi # Install mysqlclient - pip install mysql-connector-python &>/dev/null || pip install pymysql &>/dev/null + pip install mysql-connector-python &>/dev/null || pip install pymysql &>/dev/null || bashio::log.fatal "can't install mysqlclient" # Use values export DB_ENGINE=django.db.backends.mysql From 528698cdf9595ab61c069a418f10fb9ce39d2669 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:49:26 +0100 Subject: [PATCH 07/11] Update config.json --- tandoor_recipes/config.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index b68a282f0..2a048b6cc 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -4,7 +4,8 @@ "description": "recipe manager", "environment": { "DB_ENGINE": "django.db.backends.sqlite3", - "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db" + "POSTGRES_DB": "/config/addons_config/tandoor_recipes/recipes.db", + "DEBUG": "0" }, "map": ["config:rw"], "name": "Tandoor recipes", From 93122d21f01eb680e1cd3913c0f951f82be61070 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:49:29 +0100 Subject: [PATCH 08/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index ca3e27926..e01ff0cf8 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -5,6 +5,7 @@ ##################### export ALLOWED_HOSTS=$(bashio::config 'ALLOWED_HOSTS') && bashio::log.blue "ALLOWED_HOSTS=$ALLOWED_HOSTS" +export SECRET_KEY=$(bashio::config 'SECRET_KEY') && bashio::log.blue "SECRET_KEY=$SECRET_KEY" ################### # Define database # From 03b7fab1b170adffc8779e93d3a74b98e0586448 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 14:51:12 +0100 Subject: [PATCH 09/11] Update config.json --- tandoor_recipes/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index 2a048b6cc..c3a889890 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -34,6 +34,6 @@ "slug": "tandoor_recipes", "upstream": "1.0.4", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.0.4-5", + "version": "1.0.4-6", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } From 7e848acdbc785e9517b1b5f35e4f1b1677e01f0f Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 15:04:11 +0100 Subject: [PATCH 10/11] Update 99-run.sh --- tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh index e01ff0cf8..cb6cb87c0 100644 --- a/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh +++ b/tandoor_recipes/rootfs/etc/cont-init.d/99-run.sh @@ -32,7 +32,7 @@ mariadb_addon) fi # Install mysqlclient - pip install mysql-connector-python &>/dev/null || pip install pymysql &>/dev/null || bashio::log.fatal "can't install mysqlclient" + pip install pymysql &>/dev/null # Use values export DB_ENGINE=django.db.backends.mysql From 955491837d7107b3596c5cbbbba08c44b0b78281 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 14 Jan 2022 16:09:21 +0100 Subject: [PATCH 11/11] Update config.json --- tandoor_recipes/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tandoor_recipes/config.json b/tandoor_recipes/config.json index c3a889890..a7796fec8 100644 --- a/tandoor_recipes/config.json +++ b/tandoor_recipes/config.json @@ -23,7 +23,7 @@ "services": ["mysql:want"], "schema": { "SECRET_KEY": "str", - "DB_TYPE": "list(sqlite|postgresql_external|mariadb_addon)", + "DB_TYPE": "list(sqlite|postgresql_external)", "ALLOWED_HOSTS": "str?", "POSTGRES_HOST": "str?", "POSTGRES_PORT": "str?", @@ -34,6 +34,6 @@ "slug": "tandoor_recipes", "upstream": "1.0.4", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "1.0.4-6", + "version": "1.0.4-7", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" }