Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-02 20:35:25 +02:00
Code Issues Releases Activity

Add labels to container start and display.

Browse source
This commit is contained in:
Kevan Ahlquist 2015-11-26 22:28:01 -06:00
parent 25a4607ad6
commit 640c0b39c1
6 changed files with 104 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/components/container/container.html
View file

@ -54,7 +54,7 @@
<tbody>
<tr>
<td>Created:</td>
<td>{{ container.Created }}</td>
<td>{{ container.Created | date: 'medium' }}</td>
</tr>
<tr>
<td>Path:</td>
@ -62,7 +62,9 @@
</tr>
<tr>
<td>Args:</td>
<td>{{ container.Args }}</td>
<td>
<pre>{{ container.Args.join(' ') || 'None' }}</pre>
</td>
</tr>
<tr>
<td>Exposed Ports:</td>
@ -80,6 +82,21 @@
</ul>
</td>
</tr>
<tr>
<td>Labels:</td>
<td>
<table role="table" class="table">
<tr>
<th>Key</th>
<th>Value</th>
</tr>
<tr ng-repeat="(k, v) in container.Config.Labels">
<td>{{ k }}</td>
<td>{{ v }}</td>
</tr>
</table>
</td>
</tr>
<tr>
<td>Publish All:</td>
@ -110,7 +127,9 @@
</tr>
<tr>
<td>Entrypoint:</td>
<td>{{ container.Config.Entrypoint }}</td>
<td>
<pre>{{ container.Config.Entrypoint.join(' ') }}</pre>
</td>
</tr>
<tr>
<td>Volumes:</td>
@ -127,7 +146,15 @@
</tr>
<tr>
<td>State:</td>
<td><span class="label {{ container.State|getstatelabel }}">{{ container.State|getstatetext }}</span></td>
<td>
<accordion close-others="true">
<accordion-group heading="{{ container.State|getstatetext }}">
<ul>
<li ng-repeat="(key, val) in container.State">{{key}} : {{ val }}</li>
</ul>
</accordion-group>
</accordion>
</td>
</tr>
<tr>
<td>Logs:</td>

6
app/components/startContainer/startContainerController.js
View file

@ -11,6 +11,7 @@ angular.module('startContainer', ['ui.bootstrap'])
$scope.config = {
Env: [],
Labels: [],
Volumes: [],
SecurityOpts: [],
HostConfig: {
@ -66,6 +67,11 @@ angular.module('startContainer', ['ui.bootstrap'])
config.Env = config.Env.map(function (envar) {
return envar.name + '=' + envar.value;
});
var labels = {};
config.Labels = config.Labels.forEach(function(label) {
labels[label.key] = label.value;
});
config.Labels = labels;
config.Volumes = getNames(config.Volumes);
config.SecurityOpts = getNames(config.SecurityOpts);

26
app/components/startContainer/startcontainer.html
View file

@ -148,6 +148,32 @@
variable
</button>
</div>
<div class="form-group">
<label>Labels:</label>
<div ng-repeat="label in config.Labels">
<div class="form-group form-inline">
<div class="form-group">
<label class="sr-only">Key:</label>
<input type="text" ng-model="label.key" class="form-control"
placeholder="key"/>
</div>
<div class="form-group">
<label class="sr-only">Value:</label>
<input type="text" ng-model="label.value" class="form-control"
placeholder="value"/>
</div>
<div class="form-group">
<button class="btn btn-danger btn-xs form-control"
ng-click="rmEntry(config.Labels, label)">Remove
</button>
</div>
</div>
</div>
<button type="button" class="btn btn-success btn-sm"
ng-click="addEntry(config.Labels, {key: '', value: ''})">Add Label
</button>
</div>
</fieldset>
</accordion-group>
<accordion-group heading="HostConfig options" is-open="menuStatus.hostConfigOpen">

4
app/shared/filters.js
View file

@ -51,7 +51,7 @@ angular.module('dockerui.filters', [])
'use strict';
return function (state) {
if (state === undefined) {
return '';
return 'label-default';
}
if (state.Ghost && state.Running) {
@ -60,7 +60,7 @@ angular.module('dockerui.filters', [])
if (state.Running) {
return 'label-success';
}
return '';
return 'label-default';
};
})
.filter('humansize', function () {