dkbuild: maj templates

dkbuild

@@ -1102,6 +1102,9 @@ function load_environ() {
 function define_functions_env() {
     function setversion() {
         [ -n "$SETVERSION_DONE" ] && return
+        # sans argument, retourner 0
+        [ $# -eq 0 ] && return
+
         local from_file from_repo from_glob extract
         while [ $# -gt 0 ]; do
             case "$1" in

lib/dkbuild/templates/image/common/Dockerfile.in

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+FROM $REGISTRY/debian/min:$DIST
+#RUN /debian/pkg i

lib/dkbuild/templates/image/d10/.dockerignore

@@ -1,2 +0,0 @@
-/b/t/
-**/.git/

lib/dkbuild/templates/image/d10/.gitignore

@@ -1,3 +0,0 @@
-/b/
-/Dockerfile
-# autogénéré

lib/dkbuild/templates/image/d10/dkbuild

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-setdists d10
-
-# fichiers communs
-copy ../common/ ./ gitignore=.
-
-dockerfile
-    # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-    FROM $REGISTRY/debian/min:$DIST
-    #RUN /debian/pkg i
-build

lib/dkbuild/templates/image/d10/dkbuild.env

@@ -1 +0,0 @@
-../dkbuild.env

lib/dkbuild/templates/image/d11/dkbuild

@@ -4,8 +4,8 @@ setdists d11
 # fichiers communs
 copy ../common/ ./ gitignore=.
 
-dockerfile
+dockerfile "" Dockerfile.in sed="
-    # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
+s/\\\$REGISTRY/$REGISTRY/
-    FROM $REGISTRY/debian/min:$DIST
+s/\\\$DIST/$DIST/
-    #RUN /debian/pkg i
+"
 build

lib/dkbuild/templates/image/d9/.dockerignore

@@ -1,2 +0,0 @@
-/b/t/
-**/.git/

lib/dkbuild/templates/image/d9/.gitignore

@@ -1,3 +0,0 @@
-/b/
-/Dockerfile
-# autogénéré

lib/dkbuild/templates/image/d9/dkbuild

@@ -1,11 +0,0 @@
-# -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-setdists d9
-
-# fichiers communs
-copy ../common/ ./ gitignore=.
-
-dockerfile
-    # -*- coding: utf-8 mode: dockerfile -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-    FROM $REGISTRY/debian/min:$DIST
-    #RUN /debian/pkg i
-build

lib/dkbuild/templates/image/d9/dkbuild.env

@@ -1 +0,0 @@
-../dkbuild.env

lib/dkbuild/templates/image/dkbuild

@@ -1,15 +1,9 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 dists=(
     d11
-    d10
-    #d9
 )
 setdists "${dists[@]}"
 
 if dist d11; then
     include d11
-elif dist d10; then
-    include d10
-elif dist d9; then
-    include d9
 fi

lib/dkbuild/templates/php/dkbuild

@@ -1,6 +1,4 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
-setenv DIST=d11
-
 if profile prod; then
     default checkout branch=master
 elif profile test devel; then

lib/dkbuild/templates/php/dkbuild.env

@@ -1,3 +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 IMAGE=$REGISTRY/GROUP/NAME
+setenv DIST=d11