modules
/
nutools
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

maj des images par défaut dk et dkbuild

This commit is contained in:
Jephté Clain 2023-08-23 16:44:38 +04:00
parent e33f2a5afe
commit ddfbc00f78
7 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dk
View File

@ -2414,6 +2414,20 @@ fi
[ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose) [ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose)
DEFAULT_PROFILE=devel 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= PROFILE=
DM_ALIASES=() DM_ALIASES=()
DM_PROFILES=() DM_PROFILES=()
@ -2421,13 +2435,14 @@ CLUSTERDIRS=()
DEFAULT_DEVEL_SRCDIR="$HOME/wop" DEFAULT_DEVEL_SRCDIR="$HOME/wop"
COMPOSER_DEVEL_SRCDIR="$HOME/wop/php" COMPOSER_DEVEL_SRCDIR="$HOME/wop/php"
MAVEN_DEVEL_SRCDIR="$HOME/wop/sn" MAVEN_DEVEL_SRCDIR="$HOME/wop/sn"
DEFAULT_COMPOSER_IMAGE=docker.univ-reunion.fr/image/phpbuilder DEFAULT_COMPOSER_IMAGE="$REGISTRY/image/phpbuilder:d11"
DEFAULT_MAVEN_IMAGE=docker.univ-reunion.fr/image/javabuilder DEFAULT_MAVEN_IMAGE="$REGISTRY/image/javabuilder:d11"
DEFAULT_HOST_MAPPINGS=() DEFAULT_HOST_MAPPINGS=()
prod_HOST_MAPPINGS=( prod_HOST_MAPPINGS=(
docker.univ-reunion.fr:10.82.70.154 pridocker.univ-reunion.fr:10.85.1.56
repos.univ-reunion.fr:10.82.70.246 pubdocker.univ-reunion.fr:10.85.1.57
git.univ-reunion.fr:10.82.70.247 repos.univ-reunion.fr:10.85.1.57
git.univ-reunion.fr:10.85.1.55
) )
test_HOST_MAPPINGS=("${prod_HOST_MAPPINGS[@]}") test_HOST_MAPPINGS=("${prod_HOST_MAPPINGS[@]}")
set_defaults dk set_defaults dk

4
dkbuild
View File

@ -9,10 +9,10 @@ TEMPLATEDIR="$scriptdir/lib/dkbuild/templates"
[ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose) [ -n "$COMPOSE_V1" ] && DOCKER_COMPOSE=(docker-compose) || DOCKER_COMPOSE=(docker compose)
function get_default_phpbuilder_image() { 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() { function get_default_javabuilder_image() {
echo "${REGISTRY:-docker.univ-reunion.fr}/image/javabuilder:d11" echo "${REGISTRY:-pubdocker.univ-reunion.fr}/image/javabuilder:d11"
} }
##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

23
lib/default/dk
View File

@ -20,10 +20,27 @@
#MAVEN_DEVEL_SRCDIR="$HOME/wop/sn" #MAVEN_DEVEL_SRCDIR="$HOME/wop/sn"
# Image à utiliser pour les builds # Image à utiliser pour les builds
#DEFAULT_COMPOSER_IMAGE=docker.univ-reunion.fr/image/phpbuilder:d10 #DEFAULT_COMPOSER_IMAGE=pubdocker.univ-reunion.fr/image/phpbuilder:d11
#DEFAULT_MAVEN_IMAGE=docker.univ-reunion.fr/image/javabuilder:d10 #DEFAULT_MAVEN_IMAGE=pubdocker.univ-reunion.fr/image/javabuilder:d11
# Mappings d'hôtes à activer pour les builds à base d'image # Mappings d'hôtes à activer pour les builds à base d'image
#DEFAULT_HOST_MAPPINGS=() #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}") #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}

2
lib/dkbuild/templates/image/dkbuild.env
View File

@ -1,3 +1,3 @@
# -*- 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
setenv REGISTRY=docker.univ-reunion.fr setenv REGISTRY=pubdocker.univ-reunion.fr
setenv IMAGE=$REGISTRY/GROUP/NAME setenv IMAGE=$REGISTRY/GROUP/NAME

2
lib/dkbuild/templates/php/dkbuild.env
View File

@ -1,4 +1,4 @@
# -*- 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
setenv REGISTRY=docker.univ-reunion.fr setenv REGISTRY=pubdocker.univ-reunion.fr
setenv IMAGE=$REGISTRY/GROUP/NAME setenv IMAGE=$REGISTRY/GROUP/NAME
setenv DIST=d11 setenv DIST=d11

2
lib/dkbuild/templates/php_db/dkbuild.env
View File

@ -1,4 +1,4 @@
# -*- 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
setenv REGISTRY=docker.univ-reunion.fr setenv REGISTRY=pubdocker.univ-reunion.fr
setenv IMAGE=$REGISTRY/GROUP/NAME setenv IMAGE=$REGISTRY/GROUP/NAME
setenv DIST=d11 setenv DIST=d11

4
lib/dkbuild/tests/test-config
View File

@ -1,9 +1,9 @@
# -*- 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
setenv REGISTRY=docker.univ-reunion.fr setenv REGISTRY=pubdocker.univ-reunion.fr
setenv IMAGE=$REGISTRY/group/name setenv IMAGE=$REGISTRY/group/name
info "IMAGE=$IMAGE" info "IMAGE=$IMAGE"
if [ "$REGISTRY" == docker.univ-reunion.fr ]; then if [ "$REGISTRY" == pubdocker.univ-reunion.fr ]; then
note "\ note "\
Essayer de relancer avec Essayer de relancer avec
$(qvals dkbuild -j "$(relpath "$DKBUILD")" -c registry.env) $(qvals dkbuild -j "$(relpath "$DKBUILD")" -c registry.env)