sda-php
/
nulib
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modifs.mineures sans commentaires

This commit is contained in:
Jephté Clain 2024-03-27 19:32:24 +04:00
parent 635e513a8b
commit c838581ac2
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
support/dot-build.env.dist
View File

@ -17,3 +17,4 @@ PRIVAREG=
REGISTRY=pubdocker.univ-reunion.fr REGISTRY=pubdocker.univ-reunion.fr
DIST=d12 DIST=d12
IMAGENAME=nulib/rundk

19
support/rundk
View File

@ -36,6 +36,9 @@ BUILDENV=
# d12=php8.2, d11=php7.4, d10=php7.3 # d12=php8.2, d11=php7.4, d10=php7.3
DIST= DIST=
# Nom de base de l'image (sans le registry)
IMAGENAME=
################################################################################ ################################################################################
# Ne pas modifier à partir d'ici # Ne pas modifier à partir d'ici
@ -46,6 +49,7 @@ DIST=
[ -n "$BUILDENV0" ] || BUILDENV0=.build.env.dist [ -n "$BUILDENV0" ] || BUILDENV0=.build.env.dist
[ -n "$BUILDENV" ] || BUILDENV=build.env [ -n "$BUILDENV" ] || BUILDENV=build.env
[ -n "$DIST" ] || DIST=d12 [ -n "$DIST" ] || DIST=d12
[ -n "$IMAGENAME" ] || IMAGENAME=nulib/rundk
[ "$COMPOSERPHAR" == none ] && COMPOSERPHAR= [ "$COMPOSERPHAR" == none ] && COMPOSERPHAR=
[ "$BUILDENV0" == none ] && BUILDENV0= [ "$BUILDENV0" == none ] && BUILDENV0=
@ -120,13 +124,12 @@ if [ -z "$_RUNDK_IN_DOCKER" ]; then
## Charger ~/.dkbuild.env ## Charger ~/.dkbuild.env
APT_PROXY="$RUNDK_APT_PROXY" APT_PROXY=
APT_MIRROR="$RUNDK_APT_MIRROR" APT_MIRROR=
SEC_MIRROR="$RUNDK_SEC_MIRROR" SEC_MIRROR=
TIMEZONE="$RUNDK_TIMEZONE" TIMEZONE=
PRIVAREG="$RUNDK_PRIVAREG" PRIVAREG=
REGISTRY="$RUNDK_REGISTRY" REGISTRY=
IMAGE="$RUNDK_IMAGE"
PROFILE= PROFILE=
HOST_MAPPINGS=() HOST_MAPPINGS=()
function default_profile() { function default_profile() {
@ -184,8 +187,8 @@ if [ -z "$_RUNDK_IN_DOCKER" ]; then
else else
UseRslave=1 UseRslave=1
fi fi
IMAGENAME="nulib/rundk"
IMAGE=
if [ -z "$bootstrap" ]; then if [ -z "$bootstrap" ]; then
if [ -n "$BUILDENV" -a -f "$PROJDIR/$BUILDENV" ]; then if [ -n "$BUILDENV" -a -f "$PROJDIR/$BUILDENV" ]; then
source "$PROJDIR/$BUILDENV" || exit 1 source "$PROJDIR/$BUILDENV" || exit 1