fixup! Clean up

Author: Sheyla Trudo

.pipelines/containers/build-variables-template.steps.yaml

@@ -63,22 +63,22 @@ steps:
       architecture: 'x64'
 
   - pwsh: |
-      $env:VAR_ID = "$env:IMAGE_$env:OS_$env:ARCH"
+      $VAR_ID = '{0}_{1}_{2}' -f $env:IMAGE, $env:OS, $env:ARCH
   
-      $env:BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")
-      Write-Host "##vso[task.setvariable variable=BUILD_CONTEXT_$env:VAR_ID;]$env:BUILD_CONTEXT"
+      $BUILD_CONTEXT = (make "$env:MAKE_BUILD_CONTEXT")
+      Write-Host "##vso[task.setvariable variable=BUILD_CONTEXT_$VAR_ID;]$BUILD_CONTEXT"
   
-      $env:IMAGE_PLATFORM_TAG = (make "$env:MAKE_IMAGE_TAG")
-      Write-Host "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_$env:VAR_ID;]$env:IMAGE_PLATFORM_TAG"
+      $IMAGE_PLATFORM_TAG = (make "$env:MAKE_IMAGE_TAG")
+      Write-Host "##vso[task.setvariable variable=IMAGE_PLATFORM_TAG_$env:VAR_ID;]$IMAGE_PLATFORM_TAG"
   
-      $env:IMAGE_NAME_AND_TAG = (make "$env:MAKE_IMAGE_NAME_AND_TAG")
-      Write-Host "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_$env:VAR_ID;]$env:IMAGE_NAME_AND_TAG"
+      $IMAGE_NAME_AND_TAG = (make "$env:MAKE_IMAGE_NAME_AND_TAG")
+      Write-Host "##vso[task.setvariable variable=IMAGE_NAME_AND_TAG_$env:VAR_ID;]$IMAGE_NAME_AND_TAG"
   
-      $env:DOCKERFILE_PATH = (make "$env:MAKE_DOCKERFILE_PATH")
-      Write-Host "##vso[task.setvariable variable=DOCKERFILE_PATH_$env:VAR_ID;]$env:DOCKERFILE_PATH"
+      $DOCKERFILE_PATH = (make "$env:MAKE_DOCKERFILE_PATH")
+      Write-Host "##vso[task.setvariable variable=DOCKERFILE_PATH_$env:VAR_ID;]$DOCKERFILE_PATH"
   
-      $env:EXTRA_BUILD_ARGS = (make "$env:MAKE_EXTRA_BUILD_ARGS")
-      Write-Host "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_$env:VAR_ID;]$env:EXTRA_BUILD_ARGS"
+      $EXTRA_BUILD_ARGS = (make "$env:MAKE_EXTRA_BUILD_ARGS")
+      Write-Host "##vso[task.setvariable variable=EXTRA_BUILD_ARGS_$env:VAR_ID;]$EXTRA_BUILD_ARGS"
     displayName: "Get Image Build Data"
     errorActionPreference: stop
     env: