From c9b5b61398f029a9dcbba9c41a05ee6c73cb86ae Mon Sep 17 00:00:00 2001 From: goldbillka Date: Fri, 20 Oct 2023 18:38:55 +0000 Subject: [PATCH] Fixed build error --- hass-n8n/docker-entrypoint.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hass-n8n/docker-entrypoint.sh b/hass-n8n/docker-entrypoint.sh index 67820fe..125b061 100755 --- a/hass-n8n/docker-entrypoint.sh +++ b/hass-n8n/docker-entrypoint.sh @@ -26,7 +26,11 @@ do export "$key"="$value" echo "exported ${key}=${value}" done - + +export N8N_HOST="$(jq --raw-output '.n8n_host // empty' $CONFIG_PATH)" +export N8N_PORT="$(jq --raw-output '.n8n_port // empty' $CONFIG_PATH)" +export NODE_ENV="$(jq --raw-output '.node_env // empty' $CONFIG_PATH)" +export WEBHOOK_TUNNEL_URL="$(jq --raw-output '.webhook_tunnel_url // empty' $CONFIG_PATH)" export N8N_BASIC_AUTH_ACTIVE="$(jq --raw-output '.auth // empty' $CONFIG_PATH)" export N8N_BASIC_AUTH_USER="$(jq --raw-output '.auth_username // empty' $CONFIG_PATH)" export N8N_BASIC_AUTH_PASSWORD="$(jq --raw-output '.auth_password // empty' $CONFIG_PATH)" @@ -34,13 +38,10 @@ export GENERIC_TIMEZONE="$(jq --raw-output '.timezone // empty' $CONFIG_PATH)" export N8N_PROTOCOL="$(jq --raw-output '.protocol // empty' $CONFIG_PATH)" export N8N_SSL_CERT="/ssl/$(jq --raw-output '.certfile // empty' $CONFIG_PATH)" export N8N_SSL_KEY="/ssl/$(jq --raw-output '.keyfile // empty' $CONFIG_PATH)" -export N8N_CMD_LINE="$(jq --raw-output '.cmd_line_args // empty' $CONFIG_PATH)" export N8N_USER_FOLDER="${N8N_PATH}" -export N8N_HOST="$(jq --raw-output '.n8n_host // empty' $CONFIG_PATH)" -export N8N_PORT="$(jq --raw-output '.n8n_port // empty' $CONFIG_PATH)" -export NODE_ENV="$(jq --raw-output '.node_env // empty' $CONFIG_PATH)" -export WEBHOOK_TUNNEL_URL="$(jq --raw-output '.webhook_tunnel_url // empty' $CONFIG_PATH)" +export N8N_CMD_LINE="$(jq --raw-output '.cmd_line_args // empty' $CONFIG_PATH)" + if [ -z "${N8N_BASIC_AUTH_USER}" ] || [ -z "${N8N_BASIC_AUTH_ACTIVE}" ]; then export N8N_BASIC_AUTH_ACTIVE=false