Skip to content

Commit ab7b574

Browse files
committed
Move build-args to build-container task
1 parent 0a34180 commit ab7b574

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

.tekton/ansible-chatbot-stack-pull-request.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ spec:
2929
value: 5d
3030
- name: dockerfile
3131
value: Containerfile
32-
- name: build-args
33-
value:
34-
- ANSIBLE_CHATBOT_VERSION=0.9.$(tasks.git-metadata.results.commit-timestamp)
35-
- GIT_COMMIT=$(tasks.clone-repository.results.commit)
3632
pipelineSpec:
3733
description: |
3834
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -277,7 +273,8 @@ spec:
277273
value: $(tasks.clone-repository.results.commit)
278274
- name: BUILD_ARGS
279275
value:
280-
- $(params.build-args[*])
276+
- ANSIBLE_CHATBOT_VERSION=0.9.$(tasks.git-metadata.results.commit-timestamp)
277+
- GIT_COMMIT=$(tasks.clone-repository.results.commit)
281278
- name: BUILD_ARGS_FILE
282279
value: $(params.build-args-file)
283280
- name: PRIVILEGED_NESTED

.tekton/ansible-chatbot-stack-push.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ spec:
2626
value: quay.io/ansible/ansible-chatbot-stack:{{revision}}
2727
- name: dockerfile
2828
value: Containerfile
29-
- name: build-args
30-
value:
31-
- ANSIBLE_CHATBOT_VERSION=0.9.$(tasks.git-metadata.results.commit-timestamp)
32-
- IMAGE_TAGS=latest 0.9.$(tasks.git-metadata.results.commit-timestamp)
33-
- GIT_COMMIT=$(tasks.clone-repository.results.commit)
3429
pipelineSpec:
3530
description: |
3631
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -275,7 +270,9 @@ spec:
275270
value: $(tasks.clone-repository.results.commit)
276271
- name: BUILD_ARGS
277272
value:
278-
- $(params.build-args[*])
273+
- ANSIBLE_CHATBOT_VERSION=0.9.$(tasks.git-metadata.results.commit-timestamp)
274+
- IMAGE_TAGS=latest 0.9.$(tasks.git-metadata.results.commit-timestamp)
275+
- GIT_COMMIT=$(tasks.clone-repository.results.commit)
279276
- name: BUILD_ARGS_FILE
280277
value: $(params.build-args-file)
281278
- name: PRIVILEGED_NESTED

0 commit comments

Comments
 (0)