diff --git a/dk b/dk index 90712bd..c072cf8 100755 --- a/dk +++ b/dk @@ -2414,6 +2414,20 @@ fi [ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose) DEFAULT_PROFILE=devel +case "$PROFILE" in +jclain) + REGISTRY=docker.jclain.fr + PRIVAREG=docker.jclain.fr + ;; +devel) + REGISTRY=docker.devel.self + PRIVAREG=docker.devel.self + ;; +prod|test|*) + REGISTRY=pubdocker.univ-reunion.fr + PRIVAREG=pridocker.univ-reunion.fr + ;; +esac PROFILE= DM_ALIASES=() DM_PROFILES=() @@ -2421,13 +2435,14 @@ CLUSTERDIRS=() DEFAULT_DEVEL_SRCDIR="$HOME/wop" COMPOSER_DEVEL_SRCDIR="$HOME/wop/php" MAVEN_DEVEL_SRCDIR="$HOME/wop/sn" -DEFAULT_COMPOSER_IMAGE=docker.univ-reunion.fr/image/phpbuilder -DEFAULT_MAVEN_IMAGE=docker.univ-reunion.fr/image/javabuilder +DEFAULT_COMPOSER_IMAGE="$REGISTRY/image/phpbuilder:d11" +DEFAULT_MAVEN_IMAGE="$REGISTRY/image/javabuilder:d11" DEFAULT_HOST_MAPPINGS=() prod_HOST_MAPPINGS=( - docker.univ-reunion.fr:10.82.70.154 - repos.univ-reunion.fr:10.82.70.246 - git.univ-reunion.fr:10.82.70.247 + pridocker.univ-reunion.fr:10.85.1.56 + pubdocker.univ-reunion.fr:10.85.1.57 + repos.univ-reunion.fr:10.85.1.57 + git.univ-reunion.fr:10.85.1.55 ) test_HOST_MAPPINGS=("${prod_HOST_MAPPINGS[@]}") set_defaults dk diff --git a/dkbuild b/dkbuild index 0a7fc3c..43e6e5d 100755 --- a/dkbuild +++ b/dkbuild @@ -9,10 +9,10 @@ TEMPLATEDIR="$scriptdir/lib/dkbuild/templates" [ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose) function get_default_phpbuilder_image() { - echo "${REGISTRY:-docker.univ-reunion.fr}/image/phpbuilder:${DIST:-d11}" + echo "${REGISTRY:-pubdocker.univ-reunion.fr}/image/phpbuilder:${DIST:-d11}" } function get_default_javabuilder_image() { - echo "${REGISTRY:-docker.univ-reunion.fr}/image/javabuilder:d11" + echo "${REGISTRY:-pubdocker.univ-reunion.fr}/image/javabuilder:d11" } ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/lib/default/dk b/lib/default/dk index 156c98d..d39ef14 100644 --- a/lib/default/dk +++ b/lib/default/dk @@ -20,10 +20,27 @@ #MAVEN_DEVEL_SRCDIR="$HOME/wop/sn" # Image à utiliser pour les builds -#DEFAULT_COMPOSER_IMAGE=docker.univ-reunion.fr/image/phpbuilder:d10 -#DEFAULT_MAVEN_IMAGE=docker.univ-reunion.fr/image/javabuilder:d10 +#DEFAULT_COMPOSER_IMAGE=pubdocker.univ-reunion.fr/image/phpbuilder:d11 +#DEFAULT_MAVEN_IMAGE=pubdocker.univ-reunion.fr/image/javabuilder:d11 # Mappings d'hôtes à activer pour les builds à base d'image #DEFAULT_HOST_MAPPINGS=() -#prod_HOST_MAPPINGS=(docker.univ-reunion.fr:10.82.70.154 repos.univ-reunion.fr:10.82.70.246 git.univ-reunion.fr:10.82.70.247) +#prod_HOST_MAPPINGS=(pridocker.univ-reunion.fr:10.85.1.56 pubdocker.univ-reunion.fr:10.85.1.57 repos.univ-reunion.fr:10.85.1.57 git.univ-reunion.fr:10.85.1.55) #test_HOST_MAPPINGS=("${prod_HOST_MAPPINGS}") + +#case "$PROFILE" in +#jclain) +# REGISTRY=docker.jclain.fr +# PRIVAREG=docker.jclain.fr +# ;; +#devel) +# REGISTRY=docker.devel.self +# PRIVAREG=docker.devel.self +# ;; +#prod|test|*) +# REGISTRY=pubdocker.univ-reunion.fr +# PRIVAREG=pridocker.univ-reunion.fr +# ;; +#esac +#: ${DEFAULT_COMPOSER_IMAGE:=$REGISTRY/image/phpbuilder:d11} +#: ${DEFAULT_MAVEN_IMAGE:=$REGISTRY/image/javabuilder:d11} diff --git a/lib/dkbuild/templates/image/dkbuild.env b/lib/dkbuild/templates/image/dkbuild.env index f24dcb1..d0b36d4 100644 --- a/lib/dkbuild/templates/image/dkbuild.env +++ b/lib/dkbuild/templates/image/dkbuild.env @@ -1,3 +1,3 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -setenv REGISTRY=docker.univ-reunion.fr +setenv REGISTRY=pubdocker.univ-reunion.fr setenv IMAGE=$REGISTRY/GROUP/NAME diff --git a/lib/dkbuild/templates/php/dkbuild.env b/lib/dkbuild/templates/php/dkbuild.env index 31ee4d9..aff19ce 100644 --- a/lib/dkbuild/templates/php/dkbuild.env +++ b/lib/dkbuild/templates/php/dkbuild.env @@ -1,4 +1,4 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -setenv REGISTRY=docker.univ-reunion.fr +setenv REGISTRY=pubdocker.univ-reunion.fr setenv IMAGE=$REGISTRY/GROUP/NAME setenv DIST=d11 diff --git a/lib/dkbuild/templates/php_db/dkbuild.env b/lib/dkbuild/templates/php_db/dkbuild.env index 31ee4d9..aff19ce 100644 --- a/lib/dkbuild/templates/php_db/dkbuild.env +++ b/lib/dkbuild/templates/php_db/dkbuild.env @@ -1,4 +1,4 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -setenv REGISTRY=docker.univ-reunion.fr +setenv REGISTRY=pubdocker.univ-reunion.fr setenv IMAGE=$REGISTRY/GROUP/NAME setenv DIST=d11 diff --git a/lib/dkbuild/tests/test-config b/lib/dkbuild/tests/test-config index 6b7b95d..c6299e6 100644 --- a/lib/dkbuild/tests/test-config +++ b/lib/dkbuild/tests/test-config @@ -1,9 +1,9 @@ # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8 -setenv REGISTRY=docker.univ-reunion.fr +setenv REGISTRY=pubdocker.univ-reunion.fr setenv IMAGE=$REGISTRY/group/name info "IMAGE=$IMAGE" -if [ "$REGISTRY" == docker.univ-reunion.fr ]; then +if [ "$REGISTRY" == pubdocker.univ-reunion.fr ]; then note "\ Essayer de relancer avec $(qvals dkbuild -j "$(relpath "$DKBUILD")" -c registry.env)