<pman>Intégration de la branche dev74

corriger la prise en compte du proxy
2025-03-25 08:45:58 +04:00 · 2025-03-23 12:09:35 +04:00
2 changed files with 7 additions and 1 deletions
--- a/runphp/build
+++ b/runphp/build
@ -11,6 +11,12 @@ source "$RUNPHP" || exit 1
 source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
 require: template

+# recenser les valeur de proxy
+declare -A PROXY_VARS
+for var in {HTTPS,ALL,NO}_PROXY {http,https,all,no}_proxy; do
+    is_defined "$var" && PROXY_VARS[${var,,}]="${!var}"
+done
+
 BUILD_ARGS=(
    DIST NDIST
    REGISTRY
--- a/runphp/runphp
+++ b/runphp/runphp
@ -311,7 +311,6 @@ function host_init_env() {
    ## Charger la configuration

    # Recenser les valeur de proxy
-    declare -A PROXY_VARS
    for var in {HTTPS,ALL,NO}_PROXY {http,https,all,no}_proxy; do
        is_defined "$var" && PROXY_VARS[${var,,}]="${!var}"
    done
@ -633,6 +632,7 @@ function container_exec() {

 if [ "$RUNPHP_MODE" != docker ]; then
    # Lancement depuis l'extérieur du container
+    declare -A PROXY_VARS
    host_parse_args "$@"
    host_init_env
Author	SHA1	Message	Date
Jephte Clain	795e4cd2e3	<pman>Intégration de la branche dev74	2025-03-25 08:45:58 +04:00
Jephte Clain	5beb5e6621	corriger la prise en compte du proxy	2025-03-23 12:09:35 +04:00