Skip to content
This repository was archived by the owner on Dec 11, 2023. It is now read-only.

Commit f37fc9a

Browse files
committed
Backwards incompatible change. Tekton 0.7 syntax for var replacement changed to $()
1 parent 5e21130 commit f37fc9a

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

go-1.x/runtime.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
args:
4040
- -c
4141
- |
42-
cd /workspace/workspace/${inputs.params.DIRECTORY}
42+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4343
cat <<EOF > Dockerfile
4444
FROM golang:alpine
4545
# Skip known public key check to be able to pull from private repositories
@@ -50,9 +50,9 @@ spec:
5050
&& go get github.com/golang/dep/...
5151
WORKDIR /go/src/handler
5252
COPY . .
53-
RUN if [ -f "$HOME/.ssh/id_${inputs.params.SSH_KEY}" ]; then \
53+
RUN if [ -f "$HOME/.ssh/id_$(inputs.params.SSH_KEY)" ]; then \
5454
eval "\$(ssh-agent -s)"; \
55-
ssh-add $HOME/.ssh/id_${inputs.params.SSH_KEY}; \
55+
ssh-add $HOME/.ssh/id_$(inputs.params.SSH_KEY); \
5656
fi \
5757
&& if [ -f "Gopkg.toml" ]; then dep ensure; fi \
5858
&& go get -v \
@@ -70,9 +70,9 @@ spec:
7070
- name: export
7171
image: gcr.io/kaniko-project/executor:debug-v0.8.0
7272
args:
73-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
73+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
7474
- --dockerfile=Dockerfile
75-
- --destination=${inputs.params.IMAGE}
75+
- --destination=$(inputs.params.IMAGE)
7676
# Workaround not to use default config which requires gcloud credentials
7777
# to pull base image from public gcr registry
7878
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

node-10.x/runtime.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ spec:
3838
args:
3939
- -c
4040
- |
41-
cd /workspace/workspace/${inputs.params.DIRECTORY}
41+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4242
cat <<EOF > Dockerfile
4343
FROM gcr.io/triggermesh/knative-lambda-node10
44-
ENV _HANDLER "${inputs.params.HANDLER}"
44+
ENV _HANDLER "$(inputs.params.HANDLER)"
4545
4646
COPY . .
4747
RUN npm install
@@ -50,9 +50,9 @@ spec:
5050
- name: export
5151
image: gcr.io/kaniko-project/executor:debug-v0.8.0
5252
args:
53-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
53+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
5454
- --dockerfile=Dockerfile
55-
- --destination=${inputs.params.IMAGE}
55+
- --destination=$(inputs.params.IMAGE)
5656
# Workaround not to use default config which requires gcloud credentials
5757
# to pull base image from public gcr registry
5858
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

node-4.x/runtime.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ spec:
3838
args:
3939
- -c
4040
- |
41-
cd /workspace/workspace/${inputs.params.DIRECTORY}
41+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4242
cat <<EOF > Dockerfile
4343
FROM gcr.io/triggermesh/knative-lambda-node4
44-
ENV _HANDLER "${inputs.params.HANDLER}"
44+
ENV _HANDLER "$(inputs.params.HANDLER)"
4545
4646
COPY . .
4747
RUN npm install
@@ -51,8 +51,8 @@ spec:
5151
image: gcr.io/kaniko-project/executor:debug-v0.8.0
5252
args:
5353
- --dockerfile=Dockerfile
54-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
55-
- --destination=${inputs.params.IMAGE}
54+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
55+
- --destination=$(inputs.params.IMAGE)
5656
# Workaround not to use default config which requires gcloud credentials
5757
# to pull base image from public gcr registry
5858
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

python-2.7/runtime.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ spec:
3838
args:
3939
- -c
4040
- |
41-
cd /workspace/workspace/${inputs.params.DIRECTORY}
41+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4242
cat <<EOF > Dockerfile
4343
FROM gcr.io/triggermesh/knative-lambda-python27
4444
45-
ENV _HANDLER "${inputs.params.HANDLER}"
45+
ENV _HANDLER "$(inputs.params.HANDLER)"
4646
4747
COPY . .
4848
RUN if [ -f requirements.txt ]; then pip2.7 install -r requirements.txt; fi
@@ -53,8 +53,8 @@ spec:
5353
image: gcr.io/kaniko-project/executor:debug-v0.8.0
5454
args:
5555
- --dockerfile=Dockerfile
56-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
57-
- --destination=${inputs.params.IMAGE}
56+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
57+
- --destination=$(inputs.params.IMAGE)
5858
# Workaround not to use default config which requires gcloud credentials
5959
# to pull base image from public gcr registry
6060
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

python-3.7/runtime.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ spec:
3838
args:
3939
- -c
4040
- |
41-
cd /workspace/workspace/${inputs.params.DIRECTORY}
41+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4242
cat <<EOF > Dockerfile
4343
FROM gcr.io/triggermesh/knative-lambda-python37
4444
45-
ENV _HANDLER "${inputs.params.HANDLER}"
45+
ENV _HANDLER "$(inputs.params.HANDLER)"
4646
4747
COPY . .
4848
RUN if [ -f requirements.txt ]; then pip3.7 install -r requirements.txt ;fi
@@ -52,9 +52,9 @@ spec:
5252
- name: export
5353
image: gcr.io/kaniko-project/executor:debug-v0.8.0
5454
args:
55-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
55+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
5656
- --dockerfile=Dockerfile
57-
- --destination=${inputs.params.IMAGE}
57+
- --destination=$(inputs.params.IMAGE)
5858
# Workaround not to use default config which requires gcloud credentials
5959
# to pull base image from public gcr registry
6060
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

ruby-2.5/runtime.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ spec:
3838
args:
3939
- -c
4040
- |
41-
cd /workspace/workspace/${inputs.params.DIRECTORY}
41+
cd /workspace/workspace/$(inputs.params.DIRECTORY)
4242
cat <<EOF > Dockerfile
4343
FROM gcr.io/triggermesh/knative-lambda-ruby25
44-
ENV _HANDLER "${inputs.params.HANDLER}"
44+
ENV _HANDLER "$(inputs.params.HANDLER)"
4545
4646
COPY . .
4747
ENTRYPOINT ["/opt/aws-custom-runtime"]
@@ -50,8 +50,8 @@ spec:
5050
image: gcr.io/kaniko-project/executor:debug-v0.8.0
5151
args:
5252
- --dockerfile=Dockerfile
53-
- --context=/workspace/workspace/${inputs.params.DIRECTORY}
54-
- --destination=${inputs.params.IMAGE}
53+
- --context=/workspace/workspace/$(inputs.params.DIRECTORY)
54+
- --destination=$(inputs.params.IMAGE)
5555
# Workaround not to use default config which requires gcloud credentials
5656
# to pull base image from public gcr registry
5757
# https://groups.google.com/d/msg/kaniko-users/r5yoP_Ejm_c/ExoEXksDBAAJ

0 commit comments

Comments
 (0)