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(templates): fix the ability to pull an image within an offline environment (#961)

Browse source
This commit is contained in:
Anthony Lapenna 2017-06-29 16:05:39 +02:00 • committed by GitHub
parent 6609c2e928
commit 6d401dcd59
5 changed files with 27 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -54,14 +54,19 @@ angular.module('portainer.services')
return deferred.promise;
};
service.pullImage = function(image, registry) {
function pullImageAndIgnoreErrors(imageConfiguration) {
var deferred = $q.defer();
var imageDetails = ImageHelper.extractImageAndRegistryFromRepository(image);
var imageConfiguration = ImageHelper.createImageConfigForContainer(imageDetails.image, registry.URL);
var authenticationDetails = registry.Authentication ? RegistryService.encodedCredentials(registry) : '';
HttpRequestHelper.setRegistryAuthenticationHeader(authenticationDetails);
Image.create({}, imageConfiguration).$promise
.finally(function final() {
deferred.resolve();
});
return deferred.promise;
}
function pullImageAndAcknowledgeErrors(imageConfiguration) {
var deferred = $q.defer();
Image.create({}, imageConfiguration).$promise
.then(function success(data) {
@ -78,6 +83,18 @@ angular.module('portainer.services')
});
return deferred.promise;
}
service.pullImage = function(image, registry, ignoreErrors) {
var imageDetails = ImageHelper.extractImageAndRegistryFromRepository(image);
var imageConfiguration = ImageHelper.createImageConfigForContainer(imageDetails.image, registry.URL);
var authenticationDetails = registry.Authentication ? RegistryService.encodedCredentials(registry) : '';
HttpRequestHelper.setRegistryAuthenticationHeader(authenticationDetails);
if (ignoreErrors) {
return pullImageAndIgnoreErrors(imageConfiguration);
}
return pullImageAndAcknowledgeErrors(imageConfiguration);
};
service.tagImage = function(id, image, registry) {