fixup! Separate Build Changes

Author: Sheyla Trudo

.pipelines/containers/container-template.jobs.yaml

@@ -77,12 +77,12 @@ jobs:
     - template: ./container-template.steps.yaml
       parameters:
         imageNameAndTag: $(IMAGE_NAME_AND_TAG_${{ image }}_${{ parameters.os }}_${{ parameters.arch }})
-        dockerfile: $(DOCKERFILE_PATH_${{ image }}_${{ parameters.os }}_${{ parameters.arch }})
-        path: $(Build.SourcesDirectory)
+        dockerfilePath: $(DOCKERFILE_PATH_${{ image }}_${{ parameters.os }}_${{ parameters.arch }})
+        buildContextPath: $(Build.SourcesDirectory)
         targetVersion: $(IMAGE_PLATFORM_TAG_${{ image }}_${{ parameters.os }}_${{ parameters.arch }})
         targetOs: ${{ parameters.os }}
         targetArch: ${{ parameters.arch }}
-        targetPlatform: "${{ parameters.targetOs }}/${{ parameters.targetArch }}" 
+        targetPlatform: "${{ parameters.os }}/${{ parameters.arch }}" 
         addBuildArgs: 
         ${{ if eq(variables.Agent.OSArchitecture, 'ARM') }}:
           buildArch: arm64

.pipelines/containers/container-template.steps.yaml

@@ -1,23 +1,34 @@
 parameters:
-- name: imageName
+- name: imageNameAndTag
   type: string
-- name: name
+
+- name: dockerfilePath
   type: string
-  values:
-  - azure-ipam
-  - cni
-  - cns
-  - ipv6-hp-bpf
-  - npm
 
 - name: platformVersionTag
   type: string
   default: ""
 
+- name: buildContextPath
+  type: string
+  default: ""
+
 - name: targetPlatform
   type: string
   default: ""
 
+- name: targetOs
+  type: string
+  values:
+  - linux
+  - windows
+
+- name: targetArch
+  type: string
+  values:
+  - amd64
+  - arm64
+
 - name: buildOs
   type: string
   values:
@@ -30,6 +41,10 @@ parameters:
   - amd64
   - arm64
 
+- name: buildPlatform
+  type: string
+  default: ""
+
 - name: addBuildArgs
   type: object
   default: ""
@@ -48,7 +63,7 @@ steps:
       inputs:
         image: ${{ parameters.imageNameAndTag }}
         dockerfile: ${{ parameters.dockerfilePath }}
-        path: ${{ parameters.targetPath }} $(Build.SourcesDirectory)
+        path: ${{ parameters.buildContextPath }}
         buildArguments: |
           --build-arg PLATFORM="${{ parameters.buildPlatform }}" \
           --build-arg ARCH="${{ parameters.buildArch }}" \