fixup! Separate Build Changes

Author: Sheyla Trudo

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

@@ -7,25 +7,15 @@ parameters:
 
 - name: buildContextPath
   type: string
-  default: ""
-
-- name: buildPlatform
-  type: string
-  default: ""
-
-- name: buildArch
-  type: string
 
-- name: buildOs
+- name: targetVersion
   type: string
 
-- name: targetVersion
+- name: targetArch
   type: string
-  default: ""
 
 - name: targetPlatform
   type: string
-  default: ""
 
 - name: targetOs
   type: string
@@ -43,15 +33,15 @@ steps:
     dockerfile: ${{ parameters.dockerfilePath }}
     path: ${{ parameters.buildContextPath }}
     buildArguments: |
-      --build-arg PLATFORM="${{ parameters.buildPlatform }}"
-      --build-arg ARCH="${{ parameters.buildArch }}"
-      --build-arg OS="${{ parameters.buildOs }}"
+      --build-arg DEBUG="$(System.Debug)"
+      --build-arg PLATFORM="${{ parameters.targetPlatform }}"
+      --build-arg ARCH="${{ parameters.targetArch }}"
+      --build-arg OS="${{ parameters.targetOs }}"
       --build-arg VERSION="${{ parameters.targetVersion }}"
       --platform "${{ parameters.targetPlatform }}"
-      --target "${{ parameters.targetOs }}"
       ${{ parameters.addBuildArgs }}
     enableNetwork: true
-    enablePull: false
+    enablePull: true
     enableCache: true
     useBuildKit: true
 

.pipelines/containers/containerize.jobs.yaml

@@ -70,10 +70,8 @@ jobs:
         imageNameAndTag: $(IMAGE_NAME_AND_TAG_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
         dockerfilePath: $(DOCKERFILE_PATH_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
         buildContextPath: $(Build.SourcesDirectory)
-        buildPlatform: $(buildPlatform)
-        buildArch: ${{ parameters.buildArch }}
-        buildOs: ${{ parameters.buildOs }}
         targetVersion: $(IMAGE_PLATFORM_TAG_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})
         targetPlatform: $(targetPlatform)
+        targetArch: ${ parameters.targetArch }
         targetOs: ${{ parameters.targetOs }}
         addBuildArgs: $(EXTRA_BUILD_ARGS_${{ imageName }}_${{ parameters.targetOs }}_${{ parameters.targetArch }})