Compare commits
1 Commits
Author | SHA1 | Date | |
---|---|---|---|
5beb5e6621 |
14
.pman.conf
14
.pman.conf
@ -1,11 +1,11 @@
|
|||||||
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
|
# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
|
||||||
|
|
||||||
UPSTREAM=dev74
|
UPSTREAM=
|
||||||
DEVELOP=dev82
|
DEVELOP=dev74
|
||||||
FEATURE=wip82/
|
FEATURE=wip74/
|
||||||
RELEASE=rel82-
|
RELEASE=rel74-
|
||||||
MAIN=dist82
|
MAIN=dist74
|
||||||
TAG_SUFFIX=p82
|
TAG_SUFFIX=p74
|
||||||
HOTFIX=hotf82-
|
HOTFIX=hotf74-
|
||||||
DIST=
|
DIST=
|
||||||
NOAUTO=
|
NOAUTO=
|
||||||
|
@ -4,5 +4,5 @@
|
|||||||
RUNPHP=
|
RUNPHP=
|
||||||
|
|
||||||
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
|
# Si RUNPHP n'est pas défini, les variables suivantes peuvent être définies
|
||||||
DIST=d12
|
DIST=d11
|
||||||
#REGISTRY=pubdocker.univ-reunion.fr/dist
|
#REGISTRY=pubdocker.univ-reunion.fr/dist
|
||||||
|
@ -15,12 +15,12 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"symfony/yaml": "^7.1",
|
"symfony/yaml": "^5.0",
|
||||||
"ext-json": "*",
|
"ext-json": "*",
|
||||||
"php": "^8.2"
|
"php": "^7.4"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"nulib/tests": "^8.2",
|
"nulib/tests": "^7.4",
|
||||||
"ext-posix": "*",
|
"ext-posix": "*",
|
||||||
"ext-pcntl": "*",
|
"ext-pcntl": "*",
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
|
@ -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