From ec292fe1dbef08c8302c9b366fdf83c801c133a0 Mon Sep 17 00:00:00 2001
From: Chenxiong Qi <cqi@redhat.com>
Date: Thu, 8 Aug 2024 17:27:35 +0800
Subject: [PATCH] fix: add missing stepTemplate for volume mounts

Signed-off-by: Chenxiong Qi <cqi@redhat.com>
---
 .../push-dockerfile-oci-ta/0.1/push-dockerfile-oci-ta.yaml | 7 ++++---
 task/push-dockerfile-oci-ta/0.1/recipe.yaml                | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/task/push-dockerfile-oci-ta/0.1/push-dockerfile-oci-ta.yaml b/task/push-dockerfile-oci-ta/0.1/push-dockerfile-oci-ta.yaml
index d6e5036ef1..9c41707ea0 100644
--- a/task/push-dockerfile-oci-ta/0.1/push-dockerfile-oci-ta.yaml
+++ b/task/push-dockerfile-oci-ta/0.1/push-dockerfile-oci-ta.yaml
@@ -47,6 +47,10 @@ spec:
   volumes:
     - name: workdir
       emptyDir: {}
+  stepTemplate:
+    volumeMounts:
+      - mountPath: /var/workdir
+        name: workdir
   steps:
     - name: use-trusted-artifact
       image: quay.io/redhat-appstudio/build-trusted-artifacts:latest@sha256:601e0999ae062e5ee666538d651af7893a75e415b7952c85caa8a4452501029a
@@ -56,9 +60,6 @@ spec:
     - name: push
       image: quay.io/konflux-ci/oras@sha256:ecf9ba09b3a194a32ad82fe6e29ef7391cbc008e23d8d79698386d817a5572b3
       workingDir: /var/workdir
-      volumeMounts:
-        - mountPath: /var/workdir
-          name: workdir
       env:
         - name: IMAGE
           value: $(params.IMAGE)
diff --git a/task/push-dockerfile-oci-ta/0.1/recipe.yaml b/task/push-dockerfile-oci-ta/0.1/recipe.yaml
index 01fff554c7..e9fa8c9028 100644
--- a/task/push-dockerfile-oci-ta/0.1/recipe.yaml
+++ b/task/push-dockerfile-oci-ta/0.1/recipe.yaml
@@ -2,6 +2,7 @@
 base: ../../push-dockerfile/0.1/push-dockerfile.yaml
 add:
   - use-source
+preferStepTemplate: true
 removeWorkspaces:
   - workspace
 replacements: