misc: template-schema: allow json_schema property in step + refactor …

…Dockerfile-child Signed-off-by: Romain Beuque <[email protected]>
ovh · Mar 18, 2020 · e2b89be · e2b89be
1 parent a3139f7
commit e2b89be
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/hack/Dockerfile-child b/hack/Dockerfile-child
@@ -1,10 +1,11 @@
-FROM ovhcom/utask:DOCKER_TAG AS builder
+ARG UTASK_VERSION=DOCKER_TAG
+FROM ovhcom/utask:${UTASK_VERSION} AS builder
 
 COPY .  /go/src/github.com/ovh/utask
 WORKDIR /go/src/github.com/ovh/utask
 RUN make
 
-FROM ovhcom/utask:DOCKER_TAG
+FROM ovhcom/utask:${UTASK_VERSION}
 
 COPY templates  /app/templates
 COPY --from=builder /go/src/github.com/ovh/utask/plugins /app/plugins

diff --git a/hack/generate-install-script.sh b/hack/generate-install-script.sh
@@ -11,7 +11,7 @@ fi
 version=`git describe --tags $(git rev-list --tags --max-count=1)`
 
 write_block() {
-    echo "cat <<EOF >$1" >> $dst
+    echo "cat <<'EOF' >$1" >> $dst
     sed "s/DOCKER_TAG/$version/" $2 >> $dst
     echo "EOF" >> $dst
     echo "" >> $dst

diff --git a/hack/template-schema.json b/hack/template-schema.json
@@ -73,6 +73,10 @@
                 "foreach": {
                     "type": "string",
                     "description": "Elements on which the step will loop"
+                },
+                "json_schema": {
+                    "type": "object",
+                    "description": "Elements on which the step will loop"
                 }
             }
         },