diff --git a/pkg/pipelines/resources/tekton/task/func-s2i/0.1/func-s2i.yaml b/pkg/pipelines/resources/tekton/task/func-s2i/0.1/func-s2i.yaml index 5c30b7566c..cbf92216e6 100644 --- a/pkg/pipelines/resources/tekton/task/func-s2i/0.1/func-s2i.yaml +++ b/pkg/pipelines/resources/tekton/task/func-s2i/0.1/func-s2i.yaml @@ -22,7 +22,7 @@ spec: params: - name: BUILDER_IMAGE description: The location of the s2i builder image. - - name: IMAGE + - name: APP_IMAGE description: Reference of the image S2I will produce. - name: REGISTRY description: The registry associated with the function image. @@ -112,11 +112,11 @@ spec: [ -d "${ARTIFACTS_CACHE_PATH}" ] || mkdir "${ARTIFACTS_CACHE_PATH}" buildah ${CERT_DIR_FLAG} bud --storage-driver=vfs ${TLS_VERIFY_FLAG} --layers \ -v "${ARTIFACTS_CACHE_PATH}:/tmp/artifacts/:rw,z,U" \ - -f /gen-source/Dockerfile.gen -t $(params.IMAGE) . + -f /gen-source/Dockerfile.gen -t $(params.APP_IMAGE) . [[ "$(workspaces.dockerconfig.bound)" == "true" ]] && export DOCKER_CONFIG="$(workspaces.dockerconfig.path)" buildah ${CERT_DIR_FLAG} push --storage-driver=vfs ${TLS_VERIFY_FLAG} --digestfile $(workspaces.source.path)/image-digest \ - $(params.IMAGE) docker://$(params.IMAGE) + $(params.APP_IMAGE) docker://$(params.APP_IMAGE) cat $(workspaces.source.path)/image-digest | tee /tekton/results/IMAGE_DIGEST volumeMounts: diff --git a/pkg/pipelines/tekton/task_defs.go b/pkg/pipelines/tekton/task_defs.go index 1b6f901cfa..98a680dd57 100644 --- a/pkg/pipelines/tekton/task_defs.go +++ b/pkg/pipelines/tekton/task_defs.go @@ -352,7 +352,7 @@ var S2ITask = v1beta1.Task{ Description: "The location of the s2i builder image.", }, v1beta1.ParamSpec{ - Name: "IMAGE", + Name: "APP_IMAGE", Description: "Reference of the image S2I will produce.", }, v1beta1.ParamSpec{ @@ -482,11 +482,11 @@ ARTIFACTS_CACHE_PATH="$(workspaces.cache.path)/mvn-artifacts" [ -d "${ARTIFACTS_CACHE_PATH}" ] || mkdir "${ARTIFACTS_CACHE_PATH}" buildah ${CERT_DIR_FLAG} bud --storage-driver=vfs ${TLS_VERIFY_FLAG} --layers \ -v "${ARTIFACTS_CACHE_PATH}:/tmp/artifacts/:rw,z,U" \ - -f /gen-source/Dockerfile.gen -t $(params.IMAGE) . + -f /gen-source/Dockerfile.gen -t $(params.APP_IMAGE) . [[ "$(workspaces.dockerconfig.bound)" == "true" ]] && export DOCKER_CONFIG="$(workspaces.dockerconfig.path)" buildah ${CERT_DIR_FLAG} push --storage-driver=vfs ${TLS_VERIFY_FLAG} --digestfile $(workspaces.source.path)/image-digest \ - $(params.IMAGE) docker://$(params.IMAGE) + $(params.APP_IMAGE) docker://$(params.APP_IMAGE) cat $(workspaces.source.path)/image-digest | tee /tekton/results/IMAGE_DIGEST `, diff --git a/pkg/pipelines/tekton/templates_s2i.go b/pkg/pipelines/tekton/templates_s2i.go index e003aee0f6..08329ea2dc 100644 --- a/pkg/pipelines/tekton/templates_s2i.go +++ b/pkg/pipelines/tekton/templates_s2i.go @@ -79,7 +79,7 @@ func GetS2IPipeline(f fn.Function) (*v1beta1.Pipeline, error) { RunAfter: []string{"fetch-sources"}, Params: []v1beta1.Param{ v1beta1.Param{ - Name: "IMAGE", + Name: "APP_IMAGE", Value: v1beta1.ParamValue{ Type: "string", StringVal: "$(params.imageName)", @@ -436,7 +436,7 @@ spec: {{.GitCloneTaskRef}} - name: build params: - - name: IMAGE + - name: APP_IMAGE value: $(params.imageName) - name: REGISTRY value: $(params.registry)