Skip to content

Commit

Permalink
Use Maintainer label for the author
Browse files Browse the repository at this point in the history
Docker has deprecated the  stanza in favour of the
label (https://docs.docker.com/v17.03/engine/reference/builder/)

This change set updates the UI to first look for the maintainer label when
showing the author of the image. If the Image does not have a mainatiner
label it will fall back tot he maintainer stanza.

This was pulled from PR kwk#174 by 0xC4N1 in the parent repo
  • Loading branch information
Brad van der Laan committed Jun 9, 2018
1 parent c003ffa commit 9f1904e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/image/image-details-directive.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>
<div class="form-group">
<label class="col-sm-2 control-label"><span class="glyphicon glyphicon-user"></span> Author</label>
<div class="col-sm-10">
<p class="form-control-static">{{imageDetails.author}}</p>
<p class="form-control-static">{{imageDetails.labels.maintainer || imageDetails.author}}</p>
</div>
</div>
<div class="form-group" ng-if="imageDetails.comment">
Expand Down Expand Up @@ -65,7 +65,7 @@ <h2>
</p>
</div>
</div> -->

<!-- <div class="form-group">
<label class="col-sm-2 control-label"><span class="glyphicon glyphicon-compressed"></span> Size <small>(including base image sizes)</small></label>
<div class="col-sm-10">
Expand All @@ -78,7 +78,7 @@ <h2>
</button>
</p>
</div>
</div> -->
</div> -->
</form>
</tab>
<tab>
Expand Down
2 changes: 1 addition & 1 deletion app/tag/tag-list-directive.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</td>
<td><span ng-bind-html="tag.details.id | limitTo: 12"></span></td>
<td am-time-ago="tag.details.created"></td>
<td><span ng-bind-html="tag.details.author | linky"></span></td>
<td><span ng-bind-html="(tag.details.labels.maintainer || tag.details.author) | linky"></span></td>
<td ng-bind-html="tag.details.docker_version"></td>
<!-- <td><span ng-bind-html="tag.details.parent | limitTo: 12"></span></td> -->
<!-- <td>
Expand Down

0 comments on commit 9f1904e

Please sign in to comment.