Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-31 03:09:44 +02:00
Code Issues Releases Activity

fix(swarm): fix multiple Swarm related issues (#1022)

Browse source 
* fix(containers): fix an issue where the containers would not be displayed

* fix(images): image usage filtering is not compliant with docker/swarm

* fix(volume-creation): do not load volume driver with docker/swarm
This commit is contained in:
Anthony Lapenna 2017-07-12 16:11:11 +02:00 • committed by GitHub
parent 703e423e04
commit 536ca15e90
6 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/services/docker/imageService.js
View file

@ -20,11 +20,11 @@ angular.module('portainer.services')
return deferred.promise;
};
service.images = function() {
service.images = function(withUsage) {
var deferred = $q.defer();
$q.all({
dataUsage: SystemService.dataUsage(),
dataUsage: withUsage ? SystemService.dataUsage() : { Images: [] },
images: Image.query({}).$promise
})
.then(function success(data) {
@ -32,7 +32,7 @@ angular.module('portainer.services')
item.dataUsage = data.dataUsage.Images.find(function(usage) {
return item.Id === usage.Id;
});
return new ImageViewModel(item);
});
deferred.resolve(images);