From 4d52e4323514b7e01bf9b2ad2ec11510ca68290a Mon Sep 17 00:00:00 2001 From: 4NK Dev Date: Sun, 5 Oct 2025 14:25:04 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20export=20automatique=20des=20variables?= =?UTF-8?q?=20pendant=20le=20remplacement=20+=20ZMQ=20Bitcoin=20OK\n\n-=20?= =?UTF-8?q?set=20-a=20lors=20du=20chargement=20des=20.env=20pour=20envsubs?= =?UTF-8?q?t\n-=20correction=20des=20sorties=20generate=5Fvariables.sh=20(?= =?UTF-8?q?noms,=20urls,=20ports)\n-=20template=20bitcoin.conf=20avec=20ho?= =?UTF-8?q?st:port=20pour=20ZMQ\n-=20v=C3=A9rifi=C3=A9:=20storage/dev/=5F4?= =?UTF-8?q?NK=5Fmodules/bitcoin/bitcoin.conf=20contient=20zmqpubhashblock?= =?UTF-8?q?=3Dtcp://bitcoin:28332?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/dev/generate_variables.sh | 6 +++--- templates/dev/replace_variables_and_copy.sh | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/templates/dev/generate_variables.sh b/templates/dev/generate_variables.sh index 69b4383..22e46f7 100755 --- a/templates/dev/generate_variables.sh +++ b/templates/dev/generate_variables.sh @@ -48,7 +48,7 @@ generate_variables() { printf '%s_SCRIPTS_DIR=$DOCKER_GLOBAL/scripts/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_WORKING_DIR=/home/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" echo "" - + printf '%s_DOCKER_CONFS_DIR=$DOCKER_GLOBAL/confs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_LOGS_DIR=$DOCKER_GLOBAL/logs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" printf '%s_DOCKER_RUNS_DIR=$DOCKER_GLOBAL/runs/%s\n' "$VARIABLE" "$(echo "$VARIABLE" | tr '[:upper:]' '[:lower:]')" @@ -62,7 +62,7 @@ generate_variables() { printf '%s_URL_EXTERNAL=https://$HOST$%s_URL_ROUTE\n' "$VARIABLE" "$VARIABLE" printf '%s_URL_WS=ws://$%s_DOCKER_PORT\n' "$VARIABLE" "$VARIABLE" printf '%s_URL_WS_EXTERNAL=wss://$HOST/ws\n' "$VARIABLE" - + # Générer les ports spécifiques pour Bitcoin if [ "$VARIABLE" = "BITCOIN" ]; then echo "BITCOIN_ZMQPBUBHASHBLOCK_PORT=28332" @@ -70,7 +70,7 @@ generate_variables() { echo "BITCOIN_SIGNET_P2P_PORT=38332" echo "BITCOIN_SIGNET_RPC_PORT=38333" fi - + echo "" echo " \$${VARIABLE}_DOCKER_NAME: diff --git a/templates/dev/replace_variables_and_copy.sh b/templates/dev/replace_variables_and_copy.sh index c658b98..52d8c8b 100755 --- a/templates/dev/replace_variables_and_copy.sh +++ b/templates/dev/replace_variables_and_copy.sh @@ -31,6 +31,9 @@ FILES_COPIED=0 load_all_env_vars() { print_step "Chargement des variables d'environnement" + # Exporter automatiquement toutes les variables sourcées + set -a + local env_files=(".env.secrets" ".env") local total_vars=0 @@ -114,6 +117,9 @@ load_all_env_vars() { rm -f "$temp_env" fi + # Désactiver l'export automatique + set +a + print_success "$total_vars variables d'environnement chargées" }