corriger la prise en compte du proxy
This commit is contained in:
parent
0e9c4e971d
commit
5beb5e6621
@ -11,6 +11,12 @@ source "$RUNPHP" || exit 1
|
|||||||
source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
|
source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
|
||||||
require: template
|
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=(
|
BUILD_ARGS=(
|
||||||
DIST NDIST
|
DIST NDIST
|
||||||
REGISTRY
|
REGISTRY
|
||||||
|
@ -311,7 +311,6 @@ function host_init_env() {
|
|||||||
## Charger la configuration
|
## Charger la configuration
|
||||||
|
|
||||||
# Recenser les valeur de proxy
|
# Recenser les valeur de proxy
|
||||||
declare -A PROXY_VARS
|
|
||||||
for var in {HTTPS,ALL,NO}_PROXY {http,https,all,no}_proxy; do
|
for var in {HTTPS,ALL,NO}_PROXY {http,https,all,no}_proxy; do
|
||||||
is_defined "$var" && PROXY_VARS[${var,,}]="${!var}"
|
is_defined "$var" && PROXY_VARS[${var,,}]="${!var}"
|
||||||
done
|
done
|
||||||
@ -633,6 +632,7 @@ function container_exec() {
|
|||||||
|
|
||||||
if [ "$RUNPHP_MODE" != docker ]; then
|
if [ "$RUNPHP_MODE" != docker ]; then
|
||||||
# Lancement depuis l'extérieur du container
|
# Lancement depuis l'extérieur du container
|
||||||
|
declare -A PROXY_VARS
|
||||||
host_parse_args "$@"
|
host_parse_args "$@"
|
||||||
host_init_env
|
host_init_env
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user