From d62873a331a7e9de23f383f21426d69df86ebed0 Mon Sep 17 00:00:00 2001
From: edgchen1 <18449977+edgchen1@users.noreply.github.com>
Date: Thu, 1 Oct 2020 12:25:31 -0700
Subject: [PATCH] Docker image release build updates (#5326)

- Update docker image release build to use build commit.
- Use valid default in component governance detection step.
- Use smaller docker build context.
---
 ...aining-linux-gpu-docker-release-pipeline.yml | 17 ++++++++---------
 ...ent-governance-component-detection-steps.yml |  2 +-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-docker-release-pipeline.yml b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-docker-release-pipeline.yml
index 9b34e93ca7..c942fa63a5 100644
--- a/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-docker-release-pipeline.yml
+++ b/tools/ci_build/github/azure-pipelines/orttraining-linux-gpu-docker-release-pipeline.yml
@@ -1,8 +1,4 @@
 parameters:
-- name: commit
-  displayName: Commit (Default to master or use sha1)
-  type: string
-  default: master
 - name: image_tag
   displayName: Image Tag
   type: string
@@ -10,7 +6,8 @@ parameters:
 
 variables:
   docker_image_prefix: onnxruntime-training
-  linux_gpu_dockerfile: dockerfiles/Dockerfile.training
+  linux_gpu_dockerfile: '$(Build.SourcesDirectory)/dockerfiles/Dockerfile.training'
+  docker_build_context: '$(Build.SourcesDirectory)/dockerfiles'
   build_config: Release
 
 name: $(Date:yyyyMMdd)$(Rev:.r)
@@ -30,9 +27,10 @@ jobs:
           -t ${{ variables.docker_image_prefix }}-manylinux-gpu-release-stage1 \
           --target builder \
           --no-cache \
-          --build-arg COMMIT="${{ parameters.commit }}" \
+          --build-arg COMMIT="$(Build.SourceVersion)" \
           --build-arg BUILD_CONFIG="${{ variables.build_config }}" \
-          -f ${{ variables.linux_gpu_dockerfile }} .
+          -f ${{ variables.linux_gpu_dockerfile }} \
+          ${{ variables.docker_build_context }}
       workingDirectory: $(Build.SourcesDirectory)
 
   - task: CmdLine@2
@@ -56,8 +54,9 @@ jobs:
       command: build
       containerRegistry: 'ortrelease'
       repository: 'onnxruntime-training'
-      arguments: --build-arg COMMIT="${{ parameters.commit }}" --build-arg BUILD_CONFIG="${{ variables.build_config }}"
-      Dockerfile: ${{ variables.linux_gpu_dockerfile }}
+      arguments: --build-arg COMMIT="$(Build.SourceVersion)" --build-arg BUILD_CONFIG="${{ variables.build_config }}"
+      Dockerfile: '${{ variables.linux_gpu_dockerfile }}'
+      buildContext: '${{ variables.docker_build_context }}'
       tags: |
         $(Build.BuildNumber)
         ${{ parameters.image_tag }}
diff --git a/tools/ci_build/github/azure-pipelines/templates/component-governance-component-detection-steps.yml b/tools/ci_build/github/azure-pipelines/templates/component-governance-component-detection-steps.yml
index c543f7b479..c2541e3313 100644
--- a/tools/ci_build/github/azure-pipelines/templates/component-governance-component-detection-steps.yml
+++ b/tools/ci_build/github/azure-pipelines/templates/component-governance-component-detection-steps.yml
@@ -2,7 +2,7 @@
 parameters:
 - name: condition
   type: string
-  default: '' # could be 'ci_only', 'always', 'succeeded'
+  default: 'succeeded' # could be 'ci_only', 'always', 'succeeded'
 
 steps:
 - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0