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

custom trigger: more wizard progress

Browse source
This commit is contained in:
Jimmy Zelinskie 2015-03-31 17:12:40 -04:00
parent 7d1d53ebcb
commit d2f9a8838c
4 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
static/directives/setup-trigger-dialog.html
View file

@ -21,7 +21,7 @@
</div>
<div ng-switch-when="custom">
<div class="trigger-setup-custom" repository="repository" trigger="trigger"
next-set-counter="nextStepCounter" current-setp-valid="state.stepValid"
next-step-counter="nextStepCounter" current-step-valid="state.stepValid"
analyze="checkAnalyze(isValid)"></div>
</div>
</div>
@ -35,7 +35,7 @@
<div class="trigger-option-section" ng-show="currentView == 'analyzed'">
<!-- Messaging -->
<div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error'">
<div class="alert alert-danger" ng-if="pullInfo.analysis.status == 'error' && !(trigger.service == 'custom')">
{{ pullInfo.analysis.message }}
</div>
<div class="alert alert-warning" ng-if="pullInfo.analysis.status == 'warning'">
@ -59,7 +59,10 @@
</div>
</div>
<div style="margin-bottom: 12px">Please select the credentials to use when pulling the base image:</div>
<div style="margin-bottom: 12px">
<p>Because Dockerfiles may depend on other private images, you may need to use a robot account to build this repository.</p>
Please select the credentials to use when pulling the base image:
</div>
<div ng-if="!isNamespaceAdmin(repository.namespace)" style="color: #aaa;">
<strong>Note:</strong> In order to set pull credentials for a build trigger, you must be an
Administrator of the namespace <strong>{{ repository.namespace }}</strong>