vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix(custom git trigger): fix subdir input

Browse source 
### Description of Changes

  custom git triggers were being created incorrectly this creates them correctly
This commit is contained in:
Charlton Austin 2017-04-04 14:51:54 -04:00
parent df235d9315
commit 4760ea33f5
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -23,3 +23,4 @@ htmlcov
.cache .cache
.npm-debug.log .npm-debug.log
Dockerfile-e Dockerfile-e
build/

24
static/js/directives/ui/manage-trigger-custom-git/manage-trigger-custom-git.component.html
View file

@ -26,13 +26,13 @@
<linear-workflow-section class="row" <linear-workflow-section class="row"
section-id="dockerfile" section-id="dockerfile"
section-title="Build context" 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"> <div class="col-lg-7 col-md-7 col-sm-12 main-col">
<h3>Select build context directory</h3> <h3>Select build context directory</h3>
<strong>Please select the build context directory under the git repository:</strong> <strong>Please select the build context directory under the git repository:</strong>
<input class="form-control" type="text" placeholder="/" <input class="form-control" type="text" placeholder="/"
ng-model="$ctrl.config.subdir" ng-model="$ctrl.config.context"
ng-pattern="/^($|\/|\/.+)/"> ng-pattern="/^($|\/|\/.+)/">
</div> </div>
<div class="col-lg-5 col-md-5 hidden-sm hidden-xs help-col"> <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> <p>If the Dockerfile is located at the root of the git repository, enter <code>/</code> as the build context directory.</p>
</div> </div>
</linear-workflow-section><!-- /Section: Build context --> </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> </linear-workflow>
</div> </div>