github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(image-details): fix invalid CMD with images using HEALTHCHECK (#879)

pull/868/head^2
Anthony Lapenna 2017-05-23 20:43:58 +02:00 committed by GitHub
parent d3ecf1d7a8
commit a380fd9adc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/components/image/image.html
View File

@ -19,10 +19,10 @@
<div class="input-group col-md-1" style="padding:0 15px">
<span class="input-group-addon">{{ tag }}</span>
<span class="input-group-btn">
<a data-toggle="tooltip" class="btn btn-primary interactive" title="Push to registry" ng-click="pushImage(tag)">
<a data-toggle="tooltip" class="btn btn-primary interactive" title="Push to registry" ng-click="pushTag(tag)">
<span class="fa fa-upload white-icon" aria-hidden="true"></span>
</a>
<a data-toggle="tooltip" class="btn btn-primary interactive" title="Pull from registry" ng-click="pullImage(tag)">
<a data-toggle="tooltip" class="btn btn-primary interactive" title="Pull from registry" ng-click="pullTag(tag)">
<span class="fa fa-download white-icon" aria-hidden="true"></span>
</a>
<a data-toggle="tooltip" class="btn btn-primary interactive" title="Remove tag" ng-click="removeTag(tag)">

4
app/components/image/imageController.js
View File

@ -24,7 +24,7 @@ function ($scope, $stateParams, $state, ImageService, Notifications) {
});
};
$scope.pushImage = function(tag) {
$scope.pushTag = function(tag) {
$('#loadingViewSpinner').show();
ImageService.pushImage(tag)
.then(function success() {
@ -38,7 +38,7 @@ function ($scope, $stateParams, $state, ImageService, Notifications) {
});
};
$scope.pullImage = function(tag) {
$scope.pullTag = function(tag) {
$('#loadingViewSpinner').show();
ImageService.pullTag(tag)

2
app/models/imageDetails.js
View File

@ -11,7 +11,7 @@ function ImageDetailsViewModel(data) {
this.Os = data.Os;
this.Architecture = data.Architecture;
this.Author = data.Author;
this.Command = data.ContainerConfig.Cmd;
this.Command = data.Config.Cmd;
this.Entrypoint = data.ContainerConfig.Entrypoint ? data.ContainerConfig.Entrypoint : '';
this.ExposedPorts = data.ContainerConfig.ExposedPorts ? Object.keys(data.ContainerConfig.ExposedPorts) : [];
this.Volumes = data.ContainerConfig.Volumes ? Object.keys(data.ContainerConfig.Volumes) : [];