Skip to content

Commit 9f1904e

Browse files
author
Brad van der Laan
committed
Use Maintainer label for the author
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
1 parent c003ffa commit 9f1904e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

app/image/image-details-directive.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ <h2>
1717
<div class="form-group">
1818
<label class="col-sm-2 control-label"><span class="glyphicon glyphicon-user"></span> Author</label>
1919
<div class="col-sm-10">
20-
<p class="form-control-static">{{imageDetails.author}}</p>
20+
<p class="form-control-static">{{imageDetails.labels.maintainer || imageDetails.author}}</p>
2121
</div>
2222
</div>
2323
<div class="form-group" ng-if="imageDetails.comment">
@@ -65,7 +65,7 @@ <h2>
6565
</p>
6666
</div>
6767
</div> -->
68-
68+
6969
<!-- <div class="form-group">
7070
<label class="col-sm-2 control-label"><span class="glyphicon glyphicon-compressed"></span> Size <small>(including base image sizes)</small></label>
7171
<div class="col-sm-10">
@@ -78,7 +78,7 @@ <h2>
7878
</button>
7979
</p>
8080
</div>
81-
</div> -->
81+
</div> -->
8282
</form>
8383
</tab>
8484
<tab>

app/tag/tag-list-directive.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</td>
3030
<td><span ng-bind-html="tag.details.id | limitTo: 12"></span></td>
3131
<td am-time-ago="tag.details.created"></td>
32-
<td><span ng-bind-html="tag.details.author | linky"></span></td>
32+
<td><span ng-bind-html="(tag.details.labels.maintainer || tag.details.author) | linky"></span></td>
3333
<td ng-bind-html="tag.details.docker_version"></td>
3434
<!-- <td><span ng-bind-html="tag.details.parent | limitTo: 12"></span></td> -->
3535
<!-- <td>

0 commit comments

Comments
 (0)