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