Skip to content

Commit e2b89be

Browse files
committed
misc: template-schema: allow json_schema property in step + refactor Dockerfile-child
Signed-off-by: Romain Beuque <[email protected]>
1 parent a3139f7 commit e2b89be

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

hack/Dockerfile-child

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM ovhcom/utask:DOCKER_TAG AS builder
1+
ARG UTASK_VERSION=DOCKER_TAG
2+
FROM ovhcom/utask:${UTASK_VERSION} AS builder
23

34
COPY . /go/src/github.com/ovh/utask
45
WORKDIR /go/src/github.com/ovh/utask
56
RUN make
67

7-
FROM ovhcom/utask:DOCKER_TAG
8+
FROM ovhcom/utask:${UTASK_VERSION}
89

910
COPY templates /app/templates
1011
COPY --from=builder /go/src/github.com/ovh/utask/plugins /app/plugins

hack/generate-install-script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
version=`git describe --tags $(git rev-list --tags --max-count=1)`
1212

1313
write_block() {
14-
echo "cat <<EOF >$1" >> $dst
14+
echo "cat <<'EOF' >$1" >> $dst
1515
sed "s/DOCKER_TAG/$version/" $2 >> $dst
1616
echo "EOF" >> $dst
1717
echo "" >> $dst

hack/template-schema.json

+4
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
"foreach": {
7474
"type": "string",
7575
"description": "Elements on which the step will loop"
76+
},
77+
"json_schema": {
78+
"type": "object",
79+
"description": "Elements on which the step will loop"
7680
}
7781
}
7882
},

0 commit comments

Comments
 (0)