From 4760ea33f5876eb2c006c35c2f8993418dbfdc1a Mon Sep 17 00:00:00 2001
From: Charlton Austin <charlton.austin@gmail.com>
Date: Tue, 4 Apr 2017 14:51:54 -0400
Subject: [PATCH] fix(custom git trigger): fix subdir input

  ### Description of Changes

  custom git triggers were being created incorrectly this creates them correctly
---
 .gitignore                                    |  1 +
 .../manage-trigger-custom-git.component.html  | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5a2ef909..92c6f1dea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ htmlcov
 .cache
 .npm-debug.log
 Dockerfile-e
+build/
diff --git a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
index a4bf31b72..5c554e73c 100644
--- a/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
+++ b/static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
@@ -26,13 +26,13 @@
     <linear-workflow-section class="row"
       section-id="dockerfile"
       section-title="Build context"
-      section-valid="$ctrl.config.subdir">
+      section-valid="$ctrl.config.context">
 
       <div class="col-lg-7 col-md-7 col-sm-12 main-col">
         <h3>Select build context directory</h3>
         <strong>Please select the build context directory under the git repository:</strong>
         <input class="form-control" type="text" placeholder="/"
-               ng-model="$ctrl.config.subdir"
+               ng-model="$ctrl.config.context"
                ng-pattern="/^($|\/|\/.+)/">
       </div>
       <div class="col-lg-5 col-md-5 hidden-sm hidden-xs help-col">
@@ -40,5 +40,25 @@
         <p>If the Dockerfile is located at the root of the git repository, enter <code>/</code> as the build context directory.</p>
       </div>
     </linear-workflow-section><!-- /Section: Build context -->
+
+    <!-- Section: Dockerfile Location -->
+    <linear-workflow-section class="row"
+      section-id="dockerfilelocation"
+      section-title="Select Dockerfile"
+      section-valid="$ctrl.config.dockerfile_path">
+
+      <div class="col-lg-7 col-md-7 col-sm-12 main-col">
+        <h3>Select dockerfile path</h3>
+        <strong>Please select the build context directory under the git repository:</strong>
+        <input class="form-control" type="text" placeholder="{{ $ctrl.config.context }}"
+               ng-model="$ctrl.config.dockerfile_path"
+               ng-pattern="/^($|\/|\/.+)/">
+      </div>
+      <div class="col-lg-5 col-md-5 hidden-sm hidden-xs help-col">
+        <p>The dockerfile path stars with the context and ends with the path to the dockefile that you would like to build</p>
+        <p>If the Dockerfile is located at the root of the git repository and named Dockerfile, enter <code>/Dockerfile</code> as the dockerfile path.</p>
+      </div>
+    </linear-workflow-section><!-- /Section: Dockerfile Location -->
+
   </linear-workflow>
 </div>